♻️ [NNBD] Part 2. Migrate utils (#30)

* ♻️ Migrate utils to NNBD * 🎨 Improve the color getter
LianjiaTech · Dec 22, 2021 · 97b8b77 · 97b8b77
1 parent ae53073
commit 97b8b77
Show file tree

Hide file tree

Showing 23 changed files with 327 additions and 330 deletions.
diff --git a/lib/src/components/card/content_card/brn_pair_info_table.dart b/lib/src/components/card/content_card/brn_pair_info_table.dart
@@ -7,6 +7,7 @@ import 'package:bruno/src/constants/brn_asset_constants.dart';
 import 'package:bruno/src/theme/brn_theme.dart';
 import 'package:bruno/src/utils/brn_rich_text.dart';
 import 'package:bruno/src/utils/brn_tools.dart';
+import 'package:bruno/src/utils/css/brn_core_funtion.dart';
 import 'package:bruno/src/utils/css/brn_css_2_text.dart';
 import 'package:flutter/material.dart';
 
@@ -1020,7 +1021,7 @@ class BrnInfoModal {
     double itemSpacing,
     TextStyle valueTextStyle,
     bool isArrow = false,
-    BrnRichTextLinkClick richTextLinkClick,
+    BrnHyperLinkCallback richTextLinkClick,
     VoidCallback valueClickCallback,
     BrnPairInfoTableConfig themeData,
   }) {

diff --git a/lib/src/components/form/items/general/brn_quick_select_input_item.dart b/lib/src/components/form/items/general/brn_quick_select_input_item.dart
@@ -4,7 +4,7 @@ import 'package:bruno/src/components/form/base/brn_form_item_type.dart';
 import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
@@ -289,7 +289,7 @@ class QuickButtonsState extends State<QuickButtonsWidget> {
     }
 
     if (widget.btnsTxt == null) {
-      widget.btnsTxt = List<String>();
+      widget.btnsTxt = <String>[];
     }
 
     if (widget.selectBtnList == null) {
@@ -327,7 +327,7 @@ class QuickButtonsState extends State<QuickButtonsWidget> {
   }
 
   List<Widget> getBtnsByText() {
-    List<Widget> result = List<Widget>();
+    List<Widget> result = <Widget>[];
 
     for (int index = 0; index < widget.btnsTxt.length; ++index) {
       String str = widget.btnsTxt[index];
@@ -346,7 +346,7 @@ class QuickButtonsState extends State<QuickButtonsWidget> {
           child: Text(
             str,
             style: TextStyle(
-              fontSize: BrnFont.FONT_12,
+              fontSize: BrnFonts.FONT_12,
             ),
           ),
           onPressed: () {

diff --git a/lib/src/components/form/items/general/brn_range_input_item.dart b/lib/src/components/form/items/general/brn_range_input_item.dart
@@ -1,14 +1,12 @@
 // @dart=2.9
 
 import 'package:bruno/src/components/form/base/brn_form_item_type.dart';
-import 'package:bruno/src/components/form/base/input_item_interface.dart';
 import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 
 ///
 /// 范围输入型录入项
@@ -235,7 +233,7 @@ class BrnRangeInputFormItemState extends State<BrnRangeInputFormItem> {
                           widget.minUnit ?? "",
                           style: TextStyle(
                             color: Color(0xFF101010),
-                            fontSize: BrnFont.FONT_16,
+                            fontSize: BrnFonts.FONT_16,
                           ),
                         )),
                     Container(
@@ -244,7 +242,7 @@ class BrnRangeInputFormItemState extends State<BrnRangeInputFormItem> {
                           "—",
                           style: TextStyle(
                             color: Color(0xFF101010),
-                            fontSize: BrnFont.FONT_16,
+                            fontSize: BrnFonts.FONT_16,
                           ),
                         )),
                     Container(
@@ -290,7 +288,7 @@ class BrnRangeInputFormItemState extends State<BrnRangeInputFormItem> {
                           widget.maxUnit ?? "",
                           style: TextStyle(
                             color: Color(0xFF101010),
-                            fontSize: BrnFont.FONT_16,
+                            fontSize: BrnFonts.FONT_16,
                           ),
                         )),
                   ],

diff --git a/lib/src/components/form/items/general/brn_step_input_item.dart b/lib/src/components/form/items/general/brn_step_input_item.dart
@@ -7,7 +7,7 @@ import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
 import 'package:bruno/src/utils/brn_tools.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
@@ -179,7 +179,7 @@ class BrnStepInputFormItemState extends State<BrnStepInputFormItem> {
                         "${widget.value}",
                         style: TextStyle(
                           color: Color(0xFF222222),
-                          fontSize: BrnFont.FONT_16,
+                          fontSize: BrnFonts.FONT_16,
                         ),
                       ),
                     ),

diff --git a/lib/src/components/form/items/general/brn_text_input_item.dart b/lib/src/components/form/items/general/brn_text_input_item.dart
@@ -1,14 +1,12 @@
 // @dart=2.9
 
 import 'package:bruno/src/components/form/base/brn_form_item_type.dart';
-import 'package:bruno/src/components/form/base/input_item_interface.dart';
 import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 
 ///
 /// 文本输入型录入项
@@ -213,7 +211,7 @@ class BrnTextInputFormItemState extends State<BrnTextInputFormItem> {
                         widget.unit ?? "",
                         style: TextStyle(
                           color: Color(0xFF101010),
-                          fontSize: BrnFont.FONT_16,
+                          fontSize: BrnFonts.FONT_16,
                         ),
                       )),
                 ),

diff --git a/lib/src/components/form/items/general/brn_text_select_item.dart b/lib/src/components/form/items/general/brn_text_select_item.dart
@@ -7,7 +7,7 @@ import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
 import 'package:bruno/src/utils/brn_tools.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
@@ -149,7 +149,7 @@ class BrnTextSelectFormItem extends StatefulWidget {
   }
 }
 
-double _fontSize = BrnFont.FONT_16;
+double _fontSize = BrnFonts.FONT_16;
 StrutStyle _contentStructStyle = StrutStyle(
     forceStrutHeight: true, height: 1, leading: 0.5, fontSize: _fontSize);
 
@@ -291,7 +291,7 @@ class BrnTextSelectFormItemState extends State<BrnTextSelectFormItem> {
                     forceStrutHeight: true,
                     height: 1,
                     leading: 0.5,
-                    fontSize: BrnFont.FONT_14),
+                    fontSize: BrnFonts.FONT_14),
                 style: BrnFormUtil.getTipsTextStyle(widget.themeData),
               ),
             ),

diff --git a/lib/src/components/form/items/general/brn_title_select_input_item.dart b/lib/src/components/form/items/general/brn_title_select_input_item.dart
@@ -10,7 +10,7 @@ import 'package:bruno/src/constants/brn_asset_constants.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
 import 'package:bruno/src/utils/brn_tools.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -298,7 +298,7 @@ class BrnTitleSelectInputFormItemState
         border: InputBorder.none,
         hintStyle: TextStyle(
             color: Color(0xFFCCCCCC),
-            fontSize: BrnFont.FONT_16,
+            fontSize: BrnFonts.FONT_16,
             textBaseline: TextBaseline.alphabetic),
         hintText: widget.hint ?? '请输入',
         counterText: "",
@@ -349,7 +349,7 @@ class TitleSelectPopWidget extends StatefulWidget {
 class _TitleSelectPopWidgetState extends State<TitleSelectPopWidget> {
   @override
   Widget build(BuildContext context) {
-    List<Widget> showList = List();
+    List<Widget> showList = [];
     for (int i = 0, n = widget.selectList.length; i < n; ++i) {
       showList.add(selectItem(widget.selectList[i], i, i == n - 1));
     }

diff --git a/lib/src/components/form/items/group/brn_normal_group.dart b/lib/src/components/form/items/group/brn_normal_group.dart
@@ -5,9 +5,8 @@ import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/components/line/brn_line.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 ///
 /// 可展开收起组类型录入项
@@ -137,7 +136,7 @@ class BrnNormalFormGroupState extends State<BrnNormalFormGroup> {
                         widget.deleteLabel ?? "",
                         style: TextStyle(
                           color: Color(0xFFFA3F3F),
-                          fontSize: BrnFont.FONT_16,
+                          fontSize: BrnFonts.FONT_16,
                         ),
                       ),
                     ),
@@ -171,7 +170,7 @@ class BrnNormalFormGroupState extends State<BrnNormalFormGroup> {
   }
 
   List<Widget> getSubItem() {
-    List<Widget> result = List<Widget>();
+    List<Widget> result = <Widget>[];
 
     if (widget.children == null || widget.children.isEmpty) {
       return result;

diff --git a/lib/src/components/form/items/group/element_expand_widget.dart b/lib/src/components/form/items/group/element_expand_widget.dart
@@ -8,7 +8,7 @@ import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
 import 'package:bruno/src/utils/brn_tools.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
@@ -227,7 +227,7 @@ class _ExpansionElementState extends State<ExpansionElementWidget>
                         widget.deleteText ?? "",
                         style: TextStyle(
                           color: Color(0xFFFA3F3F),
-                          fontSize: BrnFont.FONT_16,
+                          fontSize: BrnFonts.FONT_16,
                         ),
                       ),
                     ),

diff --git a/lib/src/components/form/items/misc/brn_add_label_item.dart b/lib/src/components/form/items/misc/brn_add_label_item.dart
@@ -1,12 +1,10 @@
 // @dart=2.9
 
 import 'package:bruno/src/components/form/base/brn_form_item_type.dart';
-import 'package:bruno/src/components/form/base/input_item_interface.dart';
 import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 /// 添加组类型录入项所使用的Widget
 // ignore: must_be_immutable
@@ -61,7 +59,7 @@ class BrnAddLabelState extends State<BrnAddLabel> {
                 .getConfig()
                 .commonConfig
                 .brandPrimary,
-            fontSize: BrnFont.FONT_18,
+            fontSize: BrnFonts.FONT_18,
           ),
         ),
       ),

diff --git a/lib/src/components/form/items/misc/brn_title_item.dart b/lib/src/components/form/items/misc/brn_title_item.dart
@@ -4,7 +4,7 @@ import 'package:bruno/src/components/form/base/brn_form_item_type.dart';
 import 'package:bruno/src/components/form/utils/brn_form_util.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_form_config.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
@@ -135,7 +135,7 @@ class BrnTitleFormItemState extends State<BrnTitleFormItem> {
                           widget.operationLabel ?? "",
                           style: TextStyle(
                             color: widget.themeData.commonConfig.brandPrimary,
-                            fontSize: BrnFont.FONT_16,
+                            fontSize: BrnFonts.FONT_16,
                           ),
                         )),
                   ),

diff --git a/lib/src/components/selectcity/brn_single_select_city_page.dart b/lib/src/components/selectcity/brn_single_select_city_page.dart
@@ -11,7 +11,7 @@ import 'package:bruno/src/components/sugsearch/brn_search_text.dart';
 import 'package:bruno/src/constants/brn_asset_constants.dart';
 import 'package:bruno/src/constants/brn_strings_constants.dart';
 import 'package:bruno/src/utils/brn_tools.dart';
-import 'package:bruno/src/utils/font/brn_font.dart';
+import 'package:bruno/src/constants/brn_fonts_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lpinyin/lpinyin.dart';
@@ -57,7 +57,7 @@ class BrnSingleSelectCityPage extends StatefulWidget {
 }
 
 class _BrnSingleSelectCityPageState extends State<BrnSingleSelectCityPage> {
-  List<BrnSelectCityModel> _cityList = List();
+  List<BrnSelectCityModel> _cityList = [];
 
   ///搜索框的高度
   int _suspensionHeight = 40;
@@ -168,7 +168,7 @@ class _BrnSingleSelectCityPageState extends State<BrnSingleSelectCityPage> {
                     textAlign: TextAlign.center,
                     style: TextStyle(
                       color: Color(0xFF222222),
-                      fontSize: BrnFont.FONT_12,
+                      fontSize: BrnFonts.FONT_12,
                       fontWeight: FontWeight.w400,
                     ),
                   ),
@@ -363,7 +363,7 @@ class _BrnSingleSelectCityPageState extends State<BrnSingleSelectCityPage> {
 
   ///获取城市搜索结果
   List<BrnSelectCityModel> _searchCityList(String searchText) {
-    List<BrnSelectCityModel> cList = List();
+    List<BrnSelectCityModel> cList = [];
     for (int index = 0; index < _cityList.length; index++) {
       BrnSelectCityModel cInfo = _cityList[index];
       if (cInfo.name.contains(searchText) ||

diff --git a/lib/src/utils/font/brn_font.dart → lib/src/constants/brn_fonts_constants.dart b/lib/src/utils/font/brn_font.dart → lib/src/constants/brn_fonts_constants.dart
@@ -1,13 +1,10 @@
-class BrnFont {
-  static const double FONT_12 = 12;
+class BrnFonts {
+  const BrnFonts._();
 
+  static const double FONT_12 = 12;
   static const double FONT_14 = 14;
-
   static const double FONT_16 = 16;
-
   static const double FONT_18 = 18;
-
   static const double FONT_20 = 20;
-
   static const double FONT_22 = 22;
 }