From 9778a9876ac348f4bee46cbdb5c22a5839844475 Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 23 Feb 2023 21:44:17 +0700 Subject: [PATCH] TF-1487 Upgrade latest dependencies version for core module (cherry picked from commit 717b72de65503ee65c9979db9a5b319bfbb11a48) --- core/lib/data/network/dio_client.dart | 2 +- .../network/download/download_client.dart | 1 - .../network/download/download_manager.dart | 4 +- core/lib/data/utils/device_manager.dart | 6 +- .../utils/html_transformer/html_utils.dart | 4 +- .../html_content_viewer_on_web_widget.dart | 12 +- .../html_content_viewer_widget.dart | 92 ++-- core/pubspec.lock | 444 ++++++++++-------- core/pubspec.yaml | 55 +-- 9 files changed, 330 insertions(+), 290 deletions(-) diff --git a/core/lib/data/network/dio_client.dart b/core/lib/data/network/dio_client.dart index b18d77a9e..022f690a6 100644 --- a/core/lib/data/network/dio_client.dart +++ b/core/lib/data/network/dio_client.dart @@ -1,7 +1,7 @@ import 'dart:io'; +import 'package:core/data/extensions/options_extensions.dart'; import 'package:dio/dio.dart'; -import 'package:core/core.dart'; class DioClient { static const jmapHeader = 'application/json;jmapVersion=rfc-8621'; diff --git a/core/lib/data/network/download/download_client.dart b/core/lib/data/network/download/download_client.dart index b8da1522a..9373ae9f9 100644 --- a/core/lib/data/network/download/download_client.dart +++ b/core/lib/data/network/download/download_client.dart @@ -1,7 +1,6 @@ import 'dart:convert'; import 'dart:io'; -import 'dart:typed_data'; import 'package:core/data/network/dio_client.dart'; import 'package:core/data/utils/compress_file_utils.dart'; diff --git a/core/lib/data/network/download/download_manager.dart b/core/lib/data/network/download/download_manager.dart index a6a27cd44..c86eae4ad 100644 --- a/core/lib/data/network/download/download_manager.dart +++ b/core/lib/data/network/download/download_manager.dart @@ -43,8 +43,8 @@ class DownloadManager { .takeWhile((_) => cancelToken == null || !cancelToken.isCancelled) .listen((data) { subscription.pause(); - randomAccessFile.writeFrom(data).then((_randomAccessFile) { - randomAccessFile = _randomAccessFile; + randomAccessFile.writeFrom(data).then((accessFile) { + randomAccessFile = accessFile; subscription.resume(); if (cancelToken != null && cancelToken.isCancelled) { streamController.sink.addError(CancelDownloadFileException(cancelToken.cancelError?.message)); diff --git a/core/lib/data/utils/device_manager.dart b/core/lib/data/utils/device_manager.dart index 5462b20fa..25cb3157a 100644 --- a/core/lib/data/utils/device_manager.dart +++ b/core/lib/data/utils/device_manager.dart @@ -2,7 +2,6 @@ import 'dart:core'; import 'package:device_info_plus/device_info_plus.dart'; - class DeviceManager { final DeviceInfoPlugin _deviceInfoPlugin; @@ -11,9 +10,6 @@ class DeviceManager { Future isNeedRequestStoragePermissionOnAndroid() async { final androidInfo = await _deviceInfoPlugin.androidInfo; final sdkInt = androidInfo.version.sdkInt; - if (sdkInt != null) { - return sdkInt <= 28; - } - return false; + return sdkInt <= 28; } } \ No newline at end of file diff --git a/core/lib/presentation/utils/html_transformer/html_utils.dart b/core/lib/presentation/utils/html_transformer/html_utils.dart index c187bf6ea..cca0948f2 100644 --- a/core/lib/presentation/utils/html_transformer/html_utils.dart +++ b/core/lib/presentation/utils/html_transformer/html_utils.dart @@ -52,11 +52,11 @@ class HtmlUtils { if (maxOffset === scrollLeftRounded || maxOffset === (scrollLeftRounded + 1) || maxOffset === (scrollLeftRounded - 1)) { - window.$scrollEventJSChannelName.postMessage('${HtmlEventAction.scrollRightEndAction}'); + window.flutter_inappwebview.callHandler('$scrollEventJSChannelName', '${HtmlEventAction.scrollRightEndAction}'); } } else { if (scrollLeftRounded === 0) { - window.$scrollEventJSChannelName.postMessage('${HtmlEventAction.scrollLeftEndAction}'); + window.flutter_inappwebview.callHandler('$scrollEventJSChannelName', '${HtmlEventAction.scrollLeftEndAction}'); } } } diff --git a/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart b/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart index 02c73fa12..06f90825b 100644 --- a/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart +++ b/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart @@ -34,7 +34,7 @@ class HtmlContentViewerOnWeb extends StatefulWidget { }) : super(key: key); @override - _HtmlContentViewerOnWebState createState() => _HtmlContentViewerOnWebState(); + State createState() => _HtmlContentViewerOnWebState(); } class _HtmlContentViewerOnWebState extends State { @@ -226,12 +226,10 @@ class _HtmlContentViewerOnWebState extends State { } if (data['type'] != null && data['type'].contains('toDart: onChangeContent') && data['view'] == createdViewId) { - if (Scrollable.of(context) != null) { - Scrollable.of(context)!.position.ensureVisible( - context.findRenderObject()!, - duration: const Duration(milliseconds: 100), - curve: Curves.easeIn); - } + Scrollable.of(context).position.ensureVisible( + context.findRenderObject()!, + duration: const Duration(milliseconds: 100), + curve: Curves.easeIn); } if (data['type'] != null && data['type'].contains('toDart: OpenLink') && data['view'] == createdViewId) { diff --git a/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart b/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart index c420143d6..9dde960eb 100644 --- a/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart +++ b/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart @@ -2,16 +2,17 @@ import 'dart:async'; import 'dart:io'; import 'dart:ui'; -import 'package:core/core.dart'; +import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/utils/html_transformer/html_event_action.dart'; +import 'package:core/presentation/utils/html_transformer/html_template.dart'; import 'package:core/presentation/utils/html_transformer/html_utils.dart'; +import 'package:core/utils/app_logger.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:url_launcher/url_launcher.dart' as launcher; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:webview_flutter/webview_flutter.dart'; typedef OnScrollHorizontalEnd = Function(bool leftDirection); typedef OnWebViewLoaded = Function(bool isScrollPageViewActivated); @@ -23,8 +24,8 @@ class HtmlContentViewer extends StatefulWidget { final OnScrollHorizontalEnd? onScrollHorizontalEnd; final OnWebViewLoaded? onWebViewLoaded; - /// Register this callback if you want a reference to the [WebViewController]. - final void Function(WebViewController controller)? onCreated; + /// Register this callback if you want a reference to the [InAppWebViewController]. + final void Function(InAppWebViewController controller)? onCreated; /// Handler for mailto: links final Future Function(Uri mailto)? mailtoDelegate; @@ -56,7 +57,7 @@ class _HtmlContentViewState extends State { double minWidth = 300; late double maxHeightForAndroid; String? _htmlData; - late WebViewController _webViewController; + late InAppWebViewController _webViewController; bool _isLoading = true; bool horizontalGestureActivated = false; @@ -109,18 +110,15 @@ class _HtmlContentViewState extends State { if (htmlData == null || htmlData.isEmpty) { return Container(); } - return WebView( + return InAppWebView( key: ValueKey(htmlData), - javascriptMode: JavascriptMode.unrestricted, - backgroundColor: Colors.white, onWebViewCreated: (controller) async { _webViewController = controller; - await controller.loadHtmlString(htmlData, baseUrl: null); + controller.loadData(data: htmlData); widget.onCreated?.call(controller); }, - onPageFinished: _onPageFinished, - zoomEnabled: false, - navigationDelegate: _onNavigation, + onLoadStop: _onLoadStop, + shouldOverrideUrlLoading: _shouldOverrideUrlLoading, gestureRecognizers: { Factory(() => LongPressGestureRecognizer()), if (Platform.isIOS && horizontalGestureActivated) @@ -128,37 +126,38 @@ class _HtmlContentViewState extends State { if (Platform.isAndroid) Factory(() => ScaleGestureRecognizer()), }, - javascriptChannels: { - JavascriptChannel( - name: HtmlUtils.scrollEventJSChannelName, - onMessageReceived: _onHandleScrollEvent - ) - }, + onScrollChanged: (controller, x, y) => controller.scrollTo(x: 0, y: 0) ); } - void _onPageFinished(String url) async { + void _onLoadStop(InAppWebViewController controller, WebUri? webUri) async { await Future.wait([ _setActualHeightView(), _setActualWidthView(), ]); _hideLoadingProgress(); + + controller.addJavaScriptHandler( + handlerName: HtmlUtils.scrollEventJSChannelName, + callback: _onHandleScrollEvent + ); } - void _onHandleScrollEvent(JavascriptMessage javascriptMessage) { - log('_HtmlContentViewState::_onHandleScrollEvent():message: ${javascriptMessage.message}'); - if (javascriptMessage.message == HtmlEventAction.scrollRightEndAction) { - widget.onScrollHorizontalEnd?.call(false); - } else if (javascriptMessage.message == HtmlEventAction.scrollLeftEndAction) { + void _onHandleScrollEvent(List parameters) { + log('_HtmlContentViewState::_onHandleScrollRightEvent():parameters: $parameters'); + final message = parameters.first; + log('_HtmlContentViewState::_onHandleScrollRightEvent():message: $message'); + if (message == HtmlEventAction.scrollLeftEndAction) { widget.onScrollHorizontalEnd?.call(true); + } else if (message == HtmlEventAction.scrollRightEndAction) { + widget.onScrollHorizontalEnd?.call(false); } } Future _setActualHeightView() async { - final scrollHeightText = await _webViewController.runJavascriptReturningResult('document.body.scrollHeight'); - final scrollHeight = double.tryParse(scrollHeightText); - log('_HtmlContentViewState::_setActualHeightView(): scrollHeightText: $scrollHeightText'); + final scrollHeight = await _webViewController.evaluateJavascript(source: 'document.body.scrollHeight'); + log('_HtmlContentViewState::_setActualHeightView(): scrollHeight: $scrollHeight'); if (scrollHeight != null && mounted) { final scrollHeightWithBuffer = scrollHeight + 30.0; if (scrollHeightWithBuffer > minHeight) { @@ -181,13 +180,13 @@ class _HtmlContentViewState extends State { Future _setActualWidthView() async { final result = await Future.wait([ - _webViewController.runJavascriptReturningResult('document.getElementsByClassName("tmail-content")[0].scrollWidth'), - _webViewController.runJavascriptReturningResult('document.getElementsByClassName("tmail-content")[0].offsetWidth') + _webViewController.evaluateJavascript(source: 'document.getElementsByClassName("tmail-content")[0].scrollWidth'), + _webViewController.evaluateJavascript(source: 'document.getElementsByClassName("tmail-content")[0].offsetWidth') ]); if (result.length == 2) { - final scrollWidth = double.tryParse(result[0]); - final offsetWidth = double.tryParse(result[1]); + final scrollWidth = result[0]; + final offsetWidth = result[1]; log('_HtmlContentViewState::_setActualWidthView():scrollWidth: $scrollWidth'); log('_HtmlContentViewState::_setActualWidthView():offsetWidth: $offsetWidth'); @@ -203,7 +202,7 @@ class _HtmlContentViewState extends State { horizontalGestureActivated = true; }); - await _webViewController.runJavascript(HtmlUtils.runScriptsHandleScrollEvent); + await _webViewController.evaluateJavascript(source: HtmlUtils.runScriptsHandleScrollEvent); } widget.onWebViewLoaded?.call(isScrollActivated); @@ -221,21 +220,31 @@ class _HtmlContentViewState extends State { } } - FutureOr _onNavigation(NavigationRequest navigation) async { - if (navigation.isForMainFrame && navigation.url == 'about:blank') { - return NavigationDecision.navigate; + Future _shouldOverrideUrlLoading( + InAppWebViewController controller, + NavigationAction navigationAction + ) async { + final url = navigationAction.request.url?.toString(); + + if (url == null) { + return NavigationActionPolicy.CANCEL; } - final requestUri = Uri.parse(navigation.url); + + if (navigationAction.isForMainFrame && url == 'about:blank') { + return NavigationActionPolicy.ALLOW; + } + + final requestUri = Uri.parse(url); final mailtoHandler = widget.mailtoDelegate; if (mailtoHandler != null && requestUri.isScheme('mailto')) { await mailtoHandler(requestUri); - return NavigationDecision.prevent; + return NavigationActionPolicy.CANCEL; } - final url = navigation.url; + final urlDelegate = widget.urlLauncherDelegate; if (urlDelegate != null) { await urlDelegate(Uri.parse(url)); - return NavigationDecision.prevent; + return NavigationActionPolicy.CANCEL; } if (await launcher.canLaunchUrl(Uri.parse(url))) { await launcher.launchUrl( @@ -243,6 +252,7 @@ class _HtmlContentViewState extends State { mode: LaunchMode.externalApplication ); } - return NavigationDecision.prevent; + + return NavigationActionPolicy.CANCEL; } } \ No newline at end of file diff --git a/core/pubspec.lock b/core/pubspec.lock index b6bbd30cb..e614a2ce2 100644 --- a/core/pubspec.lock +++ b/core/pubspec.lock @@ -1,167 +1,166 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" + source: hosted + version: "2.4.0" async: 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" built_collection: dependency: "direct main" description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.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" + version: "1.2.1" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + url: "https://pub.dev" source: hosted version: "1.3.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: "direct main" description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.2" + version: "1.17.0" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted version: "0.17.2" 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.5" dartz: dependency: "direct main" description: name: dartz - url: "https://pub.dartlang.org" + sha256: e6acf34ad2e31b1eb00948692468c30ab48ac8250e0f0df661e29f12dd252168 + url: "https://pub.dev" source: hosted version: "0.10.1" device_info_plus: dependency: "direct main" description: name: device_info_plus - url: "https://pub.dartlang.org" + sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95" + url: "https://pub.dev" source: hosted - version: "4.0.2" - device_info_plus_linux: - dependency: transitive - description: - name: device_info_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - device_info_plus_macos: - dependency: transitive - description: - name: device_info_plus_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.3" + version: "8.1.0" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + url: "https://pub.dev" source: hosted - version: "2.6.1" - device_info_plus_web: - dependency: transitive - description: - name: device_info_plus_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - device_info_plus_windows: - dependency: transitive - description: - name: device_info_plus_windows - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.3" + version: "7.0.0" dio: dependency: "direct main" description: name: dio - url: "https://pub.dartlang.org" + sha256: "9fdbf71baeb250fc9da847f6cb2052196f62c19906a3657adfc18631a667d316" + url: "https://pub.dev" source: hosted - version: "4.0.6" + version: "5.0.0" equatable: dependency: "direct main" description: name: equatable - url: "https://pub.dartlang.org" + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.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" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted version: "6.1.4" flex_color_picker: dependency: "direct main" description: name: flex_color_picker - url: "https://pub.dartlang.org" + sha256: "607c9fdb26be84d4a5a0931ab42a7eda725372e4f5ebaa2526ab6b22ead752f9" + url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "3.1.0" + flex_seed_scheme: + dependency: transitive + description: + name: flex_seed_scheme + sha256: e61950ccadfb8d43ce5cdef382e8f689edc053ce6b837e277539410ecfb3b3e5 + url: "https://pub.dev" + source: hosted + version: "1.2.2" flutter: dependency: "direct main" description: flutter @@ -171,44 +170,90 @@ packages: dependency: "direct main" description: name: flutter_image_compress - url: "https://pub.dartlang.org" + sha256: "37f1b26399098e5f97b74c1483f534855e7dff68ead6ddaccf747029fb03f29f" + url: "https://pub.dev" + source: hosted + version: "1.1.3" + flutter_inappwebview: + dependency: "direct main" + description: + name: flutter_inappwebview + sha256: "6d6c741ddba1dba5229d63ba75767064791a7ce845196b45e31105e93d67c949" + url: "https://pub.dev" + source: hosted + version: "6.0.0-beta.22" + flutter_inappwebview_internal_annotations: + dependency: transitive + description: + name: flutter_inappwebview_internal_annotations + sha256: "064a8ccbc76217dcd3b0fd6c6ea6f549e69b2849a0233b5bb46af9632c3ce2ff" + url: "https://pub.dev" source: hosted version: "1.1.0" flutter_keyboard_visibility: dependency: "direct main" description: name: flutter_keyboard_visibility - url: "https://pub.dartlang.org" + sha256: "86b71bbaffa38e885f5c21b1182408b9be6951fd125432cf6652c636254cef2d" + url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "5.4.0" + flutter_keyboard_visibility_linux: + dependency: transitive + description: + name: flutter_keyboard_visibility_linux + sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + flutter_keyboard_visibility_macos: + dependency: transitive + description: + name: flutter_keyboard_visibility_macos + sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086 + url: "https://pub.dev" + source: hosted + version: "1.0.0" flutter_keyboard_visibility_platform_interface: dependency: transitive description: name: flutter_keyboard_visibility_platform_interface - url: "https://pub.dartlang.org" + sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4 + url: "https://pub.dev" source: hosted version: "2.0.0" flutter_keyboard_visibility_web: dependency: transitive description: name: flutter_keyboard_visibility_web - url: "https://pub.dartlang.org" + sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1 + url: "https://pub.dev" source: hosted version: "2.0.0" + flutter_keyboard_visibility_windows: + dependency: transitive + description: + name: flutter_keyboard_visibility_windows + sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73 + url: "https://pub.dev" + source: hosted + version: "1.0.0" flutter_lints: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.1" flutter_svg: dependency: "direct main" description: name: flutter_svg - url: "https://pub.dartlang.org" + sha256: "97c5b291b4fd34ae4f55d6a4c05841d4d0ed94952e033c5a6529e1b47b4d2a29" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -223,114 +268,122 @@ packages: dependency: "direct main" description: name: fluttertoast - url: "https://pub.dartlang.org" + sha256: "2f9c4d3f4836421f7067a28f8939814597b27614e021da9d63e5d3fb6e212d25" + url: "https://pub.dev" source: hosted - version: "8.0.8" + version: "8.2.1" get: dependency: "direct main" description: name: get - url: "https://pub.dartlang.org" + sha256: "2ba20a47c8f1f233bed775ba2dd0d3ac97b4cf32fc17731b3dfc672b06b0e92a" + url: "https://pub.dev" source: hosted version: "4.6.5" html: dependency: "direct main" description: name: html - url: "https://pub.dartlang.org" + sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269 + url: "https://pub.dev" source: hosted - version: "0.15.0" + version: "0.15.1" http: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" source: hosted - version: "0.13.4" + version: "0.13.5" http_parser: - dependency: transitive + dependency: "direct main" description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.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" - path_drawing: - dependency: transitive - description: - name: path_drawing - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" + version: "1.8.2" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" source: hosted version: "1.0.1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.0" 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.3" + version: "2.1.4" pointer_interceptor: dependency: "direct main" description: name: pointer_interceptor - url: "https://pub.dartlang.org" + sha256: "6aa680b30d96dccef496933d00208ad25f07e047f644dc98ce03ec6141633a9a" + url: "https://pub.dev" source: hosted - version: "0.9.1" + version: "0.9.3+4" sky_engine: dependency: transitive description: flutter @@ -340,191 +393,186 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" - sqflite: - dependency: "direct main" - description: - name: sqflite - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0+4" - sqflite_common: - dependency: transitive - description: - name: sqflite_common - url: "https://pub.dartlang.org" - source: hosted - version: "2.3.0" + 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" - synchronized: - dependency: transitive - description: - name: synchronized - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0+3" + 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" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted version: "1.3.1" universal_html: dependency: "direct main" description: name: universal_html - url: "https://pub.dartlang.org" + sha256: b5061c64c7c863c12e46279e032976f1c274f927fb3589b52b5928dcd2d52f7c + url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.0.9" universal_io: dependency: transitive description: name: universal_io - url: "https://pub.dartlang.org" + sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.0" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e" + url: "https://pub.dev" source: hosted - version: "6.1.5" + version: "6.1.10" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "1f4d9ebe86f333c15d318f81dcdc08b01d45da44af74552608455ebdc08d9732" + url: "https://pub.dev" source: hosted - version: "6.0.19" + version: "6.0.24" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: c9cd648d2f7ab56968e049d4e9116f96a85517f1dd806b96a86ea1018a3a82e5 + url: "https://pub.dev" source: hosted - version: "6.0.17" + version: "6.1.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: e29039160ab3730e42f3d811dc2a6d5f2864b90a70fb765ea60144b03307f682 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.3" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: "2dddb3291a57b074dade66b5e07e64401dd2487caefd4e9e2f467138d8c7eb06" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.3" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "574cfbe2390666003c3a1d129bdc4574aaa6728f0c00a4829a81c316de69dd9b" + url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.0.15" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: "97c9067950a0d09cbd93e2e3f0383d1403989362b97102fbf446473a48079a4b" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.4" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "254348b40251c995cf8301ac715486c8cfa0a93b7fdc4dbd495a30f04db1fb44" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "143c290b762646c696c63be5d976bde7379ea892cb6868ddc5a17cbc56e71411" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "3190cc26d9ebda686bafb9721bb6a74c6d358700f4fc978a0f2cba6912daff86" + url: "https://pub.dev" + source: hosted + version: "1.1.0" 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" - webview_flutter: - dependency: "direct main" - description: - name: webview_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" - webview_flutter_android: - dependency: transitive - description: - name: webview_flutter_android - url: "https://pub.dartlang.org" - source: hosted - version: "2.10.4" - webview_flutter_platform_interface: - dependency: transitive - description: - name: webview_flutter_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.9.5" - webview_flutter_wkwebview: - dependency: transitive - description: - name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" - source: hosted - version: "2.9.5" + version: "2.1.4" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "5cdbe09a75b5f4517adf213c68aaf53ffa162fadf54ba16f663f94f3d2664a56" + url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "4.1.1" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.2" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=2.19.2 <3.0.0" + flutter: ">=3.7.0" diff --git a/core/pubspec.yaml b/core/pubspec.yaml index 6a5bc4b9f..23e2a11ea 100644 --- a/core/pubspec.yaml +++ b/core/pubspec.yaml @@ -20,70 +20,59 @@ publish_to: none version: 1.0.0+1 environment: - sdk: ">=2.16.2 <3.0.0" + sdk: ">=2.19.2 <3.0.0" dependencies: flutter: sdk: flutter - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 + ### Dependencies from pub.dev ### + cupertino_icons: ^1.0.5 - # flutter_svg - flutter_svg: 1.1.0 + flutter_svg: 2.0.2 - # Http client - dio: 4.0.6 + dio: 5.0.0 - # dartz dartz: 0.10.1 - # equatable - equatable: 2.0.3 + equatable: 2.0.5 built_collection: 5.1.1 - html: 0.15.0 + html: 0.15.1 - # fluttertoast - fluttertoast: 8.0.8 + fluttertoast: 8.2.1 - # sqflite - sqflite: 2.0.0+4 - - # GetX get: 4.6.5 - # device_info_plus - device_info_plus: 4.0.2 + device_info_plus: 8.1.0 - # webview_flutter - webview_flutter: 3.0.0 + flutter_inappwebview: 6.0.0-beta.22 - # url_launcher - url_launcher: 6.1.5 + url_launcher: 6.1.10 - # collection - collection: 1.16.0 + universal_html: 2.0.9 - universal_html: 2.0.8 + http: 0.13.5 - http: 0.13.4 + pointer_interceptor: ^0.9.3+4 - pointer_interceptor: 0.9.1 + flutter_keyboard_visibility: 5.4.0 - flutter_keyboard_visibility: 5.2.0 + flex_color_picker: 3.1.0 - flex_color_picker: 2.5.0 + flutter_image_compress: 1.1.3 - flutter_image_compress: 1.1.0 + http_parser: 4.0.2 + + # flutter_test from sdk depends on collection 1.17.0 + collection: 1.17.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: 1.0.4 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec