diff --git a/lib/src/expander_theme_data.dart b/lib/src/expander_theme_data.dart index 50e98dd..1b6424f 100644 --- a/lib/src/expander_theme_data.dart +++ b/lib/src/expander_theme_data.dart @@ -55,11 +55,11 @@ class ExpanderThemeData { const ExpanderThemeData({ this.color, - this.position: ExpanderPosition.start, - this.type: ExpanderType.caret, - this.size: _kDefaultExpanderSize, - this.modifier: ExpanderModifier.none, - this.animated: true, + this.position = ExpanderPosition.start, + this.type = ExpanderType.caret, + this.size = _kDefaultExpanderSize, + this.modifier = ExpanderModifier.none, + this.animated = true, }); /// Creates an expander icon theme with some reasonable default values. @@ -129,5 +129,5 @@ class ExpanderThemeData { @override int get hashCode => - hashValues(color, position, type, size, modifier, animated); + Object.hash(color, position, type, size, modifier, animated); } diff --git a/lib/src/models/node.dart b/lib/src/models/node.dart index 0381ecc..440bf2c 100644 --- a/lib/src/models/node.dart +++ b/lib/src/models/node.dart @@ -41,9 +41,9 @@ class Node { const Node({ required this.key, required this.label, - this.children: const [], - this.expanded: false, - this.parent: false, + this.children = const [], + this.expanded = false, + this.parent = false, this.icon, this.data, }); @@ -152,7 +152,7 @@ class Node { @override int get hashCode { - return hashValues( + return Object.hash( key, label, icon, diff --git a/lib/src/tree_view.dart b/lib/src/tree_view.dart index 8251b15..0e17054 100644 --- a/lib/src/tree_view.dart +++ b/lib/src/tree_view.dart @@ -87,10 +87,10 @@ class TreeView extends InheritedWidget { this.onNodeLongPress, this.physics, this.onExpansionChanged, - this.allowParentSelect: false, - this.supportParentDoubleTap: false, - this.shrinkWrap: false, - this.primary: true, + this.allowParentSelect = false, + this.supportParentDoubleTap = false, + this.shrinkWrap = false, + this.primary = true, this.nodeBuilder, TreeViewTheme? theme, }) : this.theme = theme ?? const TreeViewTheme(), diff --git a/lib/src/tree_view_controller.dart b/lib/src/tree_view_controller.dart index f3818b9..143cb1c 100644 --- a/lib/src/tree_view_controller.dart +++ b/lib/src/tree_view_controller.dart @@ -38,7 +38,7 @@ class TreeViewController { final String? selectedKey; TreeViewController({ - this.children: const [], + this.children = const [], this.selectedKey, }); @@ -60,7 +60,7 @@ class TreeViewController { /// controller = controller.loadJSON(json: jsonString); /// }); /// ``` - TreeViewController loadJSON({String json: '[]'}) { + TreeViewController loadJSON({String json = '[]'}) { List jsonList = jsonDecode(json); List> list = List>.from(jsonList); return loadMap(list: list); @@ -74,7 +74,7 @@ class TreeViewController { /// controller = controller.loadMap(map: dataMap); /// }); /// ``` - TreeViewController loadMap({List> list: const []}) { + TreeViewController loadMap({List> list = const []}) { List> treeData = list.map((Map item) => Node.fromMap(item)).toList(); return TreeViewController( @@ -100,7 +100,7 @@ class TreeViewController { Node newNode, { Node? parent, int? index, - InsertMode mode: InsertMode.append, + InsertMode mode = InsertMode.append, }) { List> _data = addNode(key, newNode, parent: parent, mode: mode, index: index); @@ -394,7 +394,7 @@ class TreeViewController { Node newNode, { Node? parent, int? index, - InsertMode mode: InsertMode.append, + InsertMode mode = InsertMode.append, }) { List> _children = parent == null ? this.children : parent.children; return _children.map((Node child) { diff --git a/lib/src/tree_view_theme.dart b/lib/src/tree_view_theme.dart index 77e3301..cabad3f 100644 --- a/lib/src/tree_view_theme.dart +++ b/lib/src/tree_view_theme.dart @@ -59,19 +59,19 @@ class TreeViewTheme { final Duration expandSpeed; const TreeViewTheme({ - this.colorScheme: const ColorScheme.light(), - this.iconTheme: const IconThemeData.fallback(), - this.expanderTheme: const ExpanderThemeData.fallback(), - this.labelStyle: const TextStyle(), - this.parentLabelStyle: const TextStyle(fontWeight: FontWeight.bold), + this.colorScheme = const ColorScheme.light(), + this.iconTheme = const IconThemeData.fallback(), + this.expanderTheme = const ExpanderThemeData.fallback(), + this.labelStyle = const TextStyle(), + this.parentLabelStyle = const TextStyle(fontWeight: FontWeight.bold), this.labelOverflow, this.parentLabelOverflow, - this.levelPadding: _kDefaultLevelPadding, - this.dense: true, + this.levelPadding = _kDefaultLevelPadding, + this.dense = true, this.verticalSpacing, this.horizontalSpacing, - this.iconPadding: 8, - this.expandSpeed: const Duration(milliseconds: _kExpandSpeed), + this.iconPadding = 8, + this.expandSpeed = const Duration(milliseconds: _kExpandSpeed), }); /// Creates a [TreeView] theme with some reasonable default values. @@ -154,7 +154,7 @@ class TreeViewTheme { @override int get hashCode { - return hashValues( + return Object.hash( colorScheme, levelPadding, iconPadding, diff --git a/lib/src/utilities.dart b/lib/src/utilities.dart index e4c3c00..c78c760 100644 --- a/lib/src/utilities.dart +++ b/lib/src/utilities.dart @@ -9,7 +9,7 @@ class Utilities { static const Color WHITE = Color.fromARGB(255, 255, 255, 255); static String toRGBA(Color color) { - return 'rgba(${color.red},${color.green},${color.blue},${color.alpha / 255})'; + return 'rgba(${color.r},${color.g},${color.b},${color.a / 255})'; } static Color textColor(Color color) { diff --git a/pubspec.lock b/pubspec.lock index 1994259..461388f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,51 +5,50 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.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: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + 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.3.0" 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: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.19.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -60,94 +59,131 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + url: "https://pub.dev" + source: hosted + version: "10.0.7" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + url: "https://pub.dev" + source: hosted + version: "3.0.8" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.11.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.15.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.0" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.3.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: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + url: "https://pub.dev" 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.7.3" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + url: "https://pub.dev" + source: hosted + version: "14.3.0" sdks: - dart: ">=2.15.0 <3.0.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54"