From 49aca6c77a277e6ca0543bf3a213db9850e56c74 Mon Sep 17 00:00:00 2001 From: gmpassos Date: Sun, 6 Mar 2022 03:15:44 -0300 Subject: [PATCH] v2.0.8 - Dart `2.16`: - Organize imports. - Fix new lints. - sdk: '>=2.15.0 <3.0.0' - json_render: ^2.0.2 - dom_tools: ^2.1.0 - mercury_client: ^2.1.3 - args: ^2.3.0 --- CHANGELOG.md | 4 ++++ lib/src/bones_ui_component.dart | 2 +- lib/src/bones_ui_explorer.dart | 4 ++-- lib/src/component/color_picker.dart | 14 +++++++------- lib/src/component/menu.dart | 2 +- pubspec.yaml | 8 ++++---- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfab7cd..cb47af4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Organize imports. - Fix new lints. - sdk: '>=2.15.0 <3.0.0' +- json_render: ^2.0.2 +- dom_tools: ^2.1.0 +- mercury_client: ^2.1.3 +- args: ^2.3.0 ## 2.0.7 diff --git a/lib/src/bones_ui_component.dart b/lib/src/bones_ui_component.dart index 537ad3e..70c4253 100644 --- a/lib/src/bones_ui_component.dart +++ b/lib/src/bones_ui_component.dart @@ -1238,7 +1238,7 @@ abstract class UIComponent extends UIEventHandler { } else if (value is Map || (value is List && listMatchesAll(value, (dynamic e) => e is Map))) { var jsonRender = JSONRender.fromJSON(value) - ..renderMode = JSONRenderMode.VIEW + ..renderMode = JSONRenderMode.view ..addAllKnownTypeRenders(); return jsonRender.render(); } else if (value is Iterable && value is! List) { diff --git a/lib/src/bones_ui_explorer.dart b/lib/src/bones_ui_explorer.dart index 3cc2a5d..4b85bd7 100644 --- a/lib/src/bones_ui_explorer.dart +++ b/lib/src/bones_ui_explorer.dart @@ -686,9 +686,9 @@ class _ViewerRender { var mode = config.getPropertyAsStringTrimLC('mode'); if (mode == 'input') { - jsonRender.renderMode = JSONRenderMode.INPUT; + jsonRender.renderMode = JSONRenderMode.input; } else if (mode == 'view') { - jsonRender.renderMode = JSONRenderMode.VIEW; + jsonRender.renderMode = JSONRenderMode.view; } jsonRender.addAllKnownTypeRenders(); diff --git a/lib/src/component/color_picker.dart b/lib/src/component/color_picker.dart index 9d93180..c0f66f8 100644 --- a/lib/src/component/color_picker.dart +++ b/lib/src/component/color_picker.dart @@ -210,7 +210,7 @@ class UIColorPicker extends UIComponent { Color? _baseColor; set color(Color? color) { - color ??= Color.BLACK; + color ??= Color.black; _color = color; _hsvColor = HSVColor.fromColor(color); @@ -223,7 +223,7 @@ class UIColorPicker extends UIComponent { } set hsvColor(HSVColor? hsvColor) { - hsvColor ??= HSVColor.fromColor(Color.BLACK); + hsvColor ??= HSVColor.fromColor(Color.black); _color = hsvColor.toColor(); _hsvColor = hsvColor; @@ -236,7 +236,7 @@ class UIColorPicker extends UIComponent { } set hslColor(HSLColor? hsvColor) { - hsvColor ??= HSLColor.fromColor(Color.BLACK); + hsvColor ??= HSLColor.fromColor(Color.black); _color = hsvColor.toColor(); _hsvColor = HSVColor.fromColor(_color!); @@ -383,9 +383,9 @@ class UIColorPicker extends UIComponent { _square!.onMouseUp.listen(_squareUp); _square!.onMouseMove.listen(_squareDrag); - redirect_onTouchStart_to_MouseEvent(_square!); + redirectOnTouchStartToMouseEvent(_square!); _square!.onTouchEnd.listen(_squareUp); - redirect_onTouchMove_to_MouseEvent(_square!); + redirectOnTouchMoveToMouseEvent(_square!); _square!.onClick.listen(_squareClick); @@ -397,7 +397,7 @@ class UIColorPicker extends UIComponent { _luma!.onTouchStart.listen(_lumaDown); _luma!.onTouchEnd.listen(_lumaUp); - redirect_onTouchMove_to_MouseEvent(_luma!); + redirectOnTouchMoveToMouseEvent(_luma!); _luma!.onClick.listen(_lumaClick); @@ -409,7 +409,7 @@ class UIColorPicker extends UIComponent { _saturation!.onTouchStart.listen(_saturationDown); _saturation!.onTouchEnd.listen(_saturationUp); - redirect_onTouchMove_to_MouseEvent(_saturation!); + redirectOnTouchMoveToMouseEvent(_saturation!); _saturation!.onClick.listen(_saturationClick); diff --git a/lib/src/component/menu.dart b/lib/src/component/menu.dart index fe7a505..8bf93ad 100644 --- a/lib/src/component/menu.dart +++ b/lib/src/component/menu.dart @@ -410,7 +410,7 @@ class UIPopupMenu extends UIComponent { } } - return '$CSS_MAX_Z_INDEX'; + return '$cssMaxZIndex'; } Point? get renderPoint { diff --git a/pubspec.yaml b/pubspec.yaml index 6d68525..1e9c2c0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,9 +15,9 @@ dependencies: dynamic_call: ^2.0.1 mercury_client: ^2.1.3 intl_messages: ^2.0.1 - dom_tools: ^2.0.1 + dom_tools: ^2.1.0 dom_builder: ^2.0.8 - json_render: ^2.0.1 + json_render: ^2.0.2 json_object_mapper: ^2.0.0 html_unescape: ^2.0.0 intl: ^0.17.0 @@ -46,12 +46,12 @@ dev_dependencies: # path: ../mercury_client # intl_messages: # path: ../intl_messages +# amdjs: +# path: ../amdjs.dart # dom_builder: # path: ../dom_builder # dom_tools: # path: ../dom_tools -# dom_builder: -# path: ../dom_builder # json_render: # path: ../json_render # json_object_mapper: