Merge remote-tracking branch 'origin/3.x'

LianjiaTech · Feb 1, 2023 · 1cc26d1 · 1cc26d1
2 parents 7b46e06 + d9bc99b
commit 1cc26d1
Show file tree

Hide file tree

Showing 15 changed files with 182 additions and 147 deletions.
diff --git a/lib/src/components/appraise/brn_appraise_bottom_picker.dart b/lib/src/components/appraise/brn_appraise_bottom_picker.dart
@@ -1,7 +1,7 @@
-import 'package:bruno/bruno.dart';
 import 'package:bruno/src/components/appraise/brn_appraise.dart';
 import 'package:bruno/src/components/appraise/brn_appraise_header.dart';
 import 'package:bruno/src/components/appraise/brn_appraise_config.dart';
+import 'package:bruno/src/l10n/brn_intl.dart';
 import 'package:flutter/material.dart';
 import 'package:bruno/src/components/appraise/brn_appraise_interface.dart';
 

diff --git a/lib/src/components/dialog/brn_middle_input_diaolg.dart b/lib/src/components/dialog/brn_middle_input_diaolg.dart
@@ -1,5 +1,5 @@
-import 'package:bruno/bruno.dart';
 import 'package:bruno/src/components/dialog/brn_dialog.dart';
+import 'package:bruno/src/l10n/brn_intl.dart';
 import 'package:bruno/src/theme/brn_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';

diff --git a/lib/src/components/dialog/brn_safe_dialog.dart b/lib/src/components/dialog/brn_safe_dialog.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:bruno/bruno.dart';
 import 'package:flutter/material.dart';
 
 /// * * * * * * * * * * *

diff --git a/lib/src/components/form/items/general/brn_radio_portrait_input_item.dart b/lib/src/components/form/items/general/brn_radio_portrait_input_item.dart
@@ -1,5 +1,9 @@
-import 'package:bruno/bruno.dart';
+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/components/line/brn_line.dart';
+import 'package:bruno/src/components/radio/brn_radio_button.dart';
+import 'package:bruno/src/theme/brn_theme.dart';
 import 'package:flutter/material.dart';
 
 ///

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
@@ -1,6 +1,10 @@
-import 'package:bruno/bruno.dart';
+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/constants/brn_asset_constants.dart';
 import 'package:bruno/src/constants/brn_fonts_constants.dart';
+import 'package:bruno/src/theme/brn_theme.dart';
+import 'package:bruno/src/utils/brn_tools.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 

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
@@ -2,9 +2,9 @@
 
 import 'dart:math';
 
-import 'package:bruno/bruno.dart';
 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/l10n/brn_intl.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';

diff --git a/lib/src/components/loading/brn_loading.dart b/lib/src/components/loading/brn_loading.dart
@@ -1,4 +1,4 @@
-import 'package:bruno/bruno.dart';
+import 'package:bruno/src/components/dialog/brn_safe_dialog.dart';
 import 'package:bruno/src/l10n/brn_intl.dart';
 import 'package:flutter/material.dart';
 

diff --git a/lib/src/components/picker/base/brn_picker_title_config.dart b/lib/src/components/picker/base/brn_picker_title_config.dart
@@ -1,4 +1,3 @@
-import 'package:bruno/bruno.dart';
 import 'package:flutter/material.dart';
 
 import 'package:bruno/src/components/picker/base/brn_picker_constants.dart';

diff --git a/lib/src/components/radio/brn_checkbox.dart b/lib/src/components/radio/brn_checkbox.dart
@@ -1,4 +1,6 @@
-import 'package:bruno/bruno.dart';
+import 'package:bruno/src/components/radio/brn_radio_core.dart';
+import 'package:bruno/src/constants/brn_asset_constants.dart';
+import 'package:bruno/src/utils/brn_tools.dart';
 import 'package:flutter/material.dart';
 
 ///多选按钮

diff --git a/lib/src/components/radio/brn_radio_button.dart b/lib/src/components/radio/brn_radio_button.dart
@@ -1,4 +1,6 @@
-import 'package:bruno/bruno.dart';
+import 'package:bruno/src/components/radio/brn_radio_core.dart';
+import 'package:bruno/src/constants/brn_asset_constants.dart';
+import 'package:bruno/src/utils/brn_tools.dart';
 import 'package:flutter/material.dart';
 
 ///单选按钮

diff --git a/lib/src/components/selection/brn_flat_selection.dart b/lib/src/components/selection/brn_flat_selection.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:bruno/bruno.dart';
 import 'package:bruno/src/components/popup/brn_measure_size.dart';
 import 'package:bruno/src/components/selection/bean/brn_selection_common_entity.dart';
 import 'package:bruno/src/components/selection/brn_selection_util.dart';
@@ -9,6 +8,7 @@ import 'package:bruno/src/components/selection/controller/brn_flat_selection_con
 import 'package:bruno/src/components/selection/converter/brn_selection_converter.dart';
 import 'package:bruno/src/components/selection/widget/brn_flat_selection_item.dart';
 import 'package:bruno/src/components/toast/brn_toast.dart';
+import 'package:bruno/src/l10n/brn_intl.dart';
 import 'package:bruno/src/theme/brn_theme_configurator.dart';
 import 'package:bruno/src/theme/configs/brn_selection_config.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_main.dart b/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_main.dart
@@ -3,7 +3,8 @@
 import 'dart:collection' show Queue;
 import 'dart:math' as math;
 
-import 'package:bruno/bruno.dart';
+import 'package:bruno/src/components/tabbar/bottom/brn_bottom_tab_bar_item.dart';
+import 'package:bruno/src/theme/brn_theme.dart';
 import 'package:flutter/material.dart';
 
 /// 定义一些UI常量,根据UI稿进行填写