From 3525f7fd914357e74a2cdb228eb1f858fed76f0a Mon Sep 17 00:00:00 2001 From: daniel360kim Date: Sat, 24 Aug 2024 17:27:32 -0500 Subject: [PATCH 1/2] added dart ui import - hashValues fix --- example/pubspec.lock | 72 ++++++++++++++++++++++++++-------------- lib/src/ast/options.dart | 2 ++ 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 13b42c3f..f1495eb4 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" crypto: dependency: transitive description: @@ -146,14 +146,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" - js: + leak_tracker: dependency: transitive description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" markdown: dependency: transitive description: @@ -166,26 +182,26 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.15.0" mime: dependency: transitive description: @@ -206,10 +222,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -315,26 +331,26 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -355,10 +371,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.7.2" tuple: dependency: transitive description: @@ -407,6 +423,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + url: "https://pub.dev" + source: hosted + version: "14.2.5" webview_flutter: dependency: transitive description: @@ -472,5 +496,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.7.0-0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/lib/src/ast/options.dart b/lib/src/ast/options.dart index 26c621f1..a06382f4 100644 --- a/lib/src/ast/options.dart +++ b/lib/src/ast/options.dart @@ -1,6 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'dart:ui'; import '../font/metrics/font_metrics.dart'; import 'font_metrics.dart'; import 'size.dart'; @@ -398,6 +399,7 @@ class FontOptions { @override int get hashCode => hashValues(fontFamily.hashCode, fontWeight.hashCode, fontShape.hashCode); + } /// Difference between the current [FontOptions] and the desired [FontOptions]. From db142ce3a35fcd27a0b8877da5900148f825df27 Mon Sep 17 00:00:00 2001 From: daniel360kim Date: Sat, 24 Aug 2024 17:33:51 -0500 Subject: [PATCH 2/2] replaced deprecated hashValues function from dart:ui --- lib/src/ast/options.dart | 4 ++-- lib/src/widgets/selectable.dart | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/src/ast/options.dart b/lib/src/ast/options.dart index a06382f4..cdad3b31 100644 --- a/lib/src/ast/options.dart +++ b/lib/src/ast/options.dart @@ -398,7 +398,7 @@ class FontOptions { @override int get hashCode => - hashValues(fontFamily.hashCode, fontWeight.hashCode, fontShape.hashCode); + Object.hash(fontFamily.hashCode, fontWeight.hashCode, fontShape.hashCode); } @@ -433,5 +433,5 @@ class PartialFontOptions { @override int get hashCode => - hashValues(fontFamily.hashCode, fontWeight.hashCode, fontShape.hashCode); + Object.hash(fontFamily.hashCode, fontWeight.hashCode, fontShape.hashCode); } diff --git a/lib/src/widgets/selectable.dart b/lib/src/widgets/selectable.dart index 570f4339..0ee7410b 100644 --- a/lib/src/widgets/selectable.dart +++ b/lib/src/widgets/selectable.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; +import 'dart:ui'; import '../ast/options.dart'; import '../ast/style.dart'; @@ -600,7 +601,7 @@ class SelectionStyle { } @override - int get hashCode => hashValues( + int get hashCode => Object.hash( cursorColor, cursorOffset, cursorRadius,