diff --git a/lib/src/theme/base/brn_default_config_utils.dart b/lib/src/theme/base/brn_default_config_utils.dart index 5245347d..38c2e158 100644 --- a/lib/src/theme/base/brn_default_config_utils.dart +++ b/lib/src/theme/base/brn_default_config_utils.dart @@ -1,17 +1,19 @@ // @dart=2.9 -import 'package:bruno/bruno.dart'; import 'package:bruno/src/components/navbar/brn_appbar_theme.dart'; import 'package:bruno/src/components/picker/base/brn_picker_constants.dart'; +import 'package:bruno/src/constants/brn_asset_constants.dart'; import 'package:bruno/src/constants/brn_strings_constants.dart'; -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/base/brn_text_style.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:bruno/src/theme/configs/brn_abnormal_state_config.dart'; import 'package:bruno/src/theme/configs/brn_action_sheet_config.dart'; +import 'package:bruno/src/theme/configs/brn_all_config.dart'; import 'package:bruno/src/theme/configs/brn_appbar_config.dart'; import 'package:bruno/src/theme/configs/brn_button_config.dart'; import 'package:bruno/src/theme/configs/brn_card_title_config.dart'; import 'package:bruno/src/theme/configs/brn_common_config.dart'; +import 'package:bruno/src/theme/configs/brn_dialog_config.dart'; import 'package:bruno/src/theme/configs/brn_form_config.dart'; import 'package:bruno/src/theme/configs/brn_gallery_detail_config.dart'; import 'package:bruno/src/theme/configs/brn_enhance_number_card_config.dart'; diff --git a/lib/src/theme/brn_theme_configurator.dart b/lib/src/theme/brn_theme_configurator.dart index 5795e12e..f54dd6e4 100644 --- a/lib/src/theme/brn_theme_configurator.dart +++ b/lib/src/theme/brn_theme_configurator.dart @@ -1,6 +1,6 @@ // @dart=2.9 -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/base/brn_default_config_utils.dart'; import 'package:bruno/src/theme/configs/brn_all_config.dart'; class BrnThemeConfigurator { diff --git a/lib/src/theme/configs/brn_all_config.dart b/lib/src/theme/configs/brn_all_config.dart index 9d510f0d..df11e7c6 100644 --- a/lib/src/theme/configs/brn_all_config.dart +++ b/lib/src/theme/configs/brn_all_config.dart @@ -1,7 +1,21 @@ // @dart=2.9 -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:bruno/src/theme/configs/brn_abnormal_state_config.dart'; +import 'package:bruno/src/theme/configs/brn_action_sheet_config.dart'; +import 'package:bruno/src/theme/configs/brn_appbar_config.dart'; +import 'package:bruno/src/theme/configs/brn_button_config.dart'; +import 'package:bruno/src/theme/configs/brn_card_title_config.dart'; +import 'package:bruno/src/theme/configs/brn_common_config.dart'; +import 'package:bruno/src/theme/configs/brn_dialog_config.dart'; +import 'package:bruno/src/theme/configs/brn_enhance_number_card_config.dart'; +import 'package:bruno/src/theme/configs/brn_form_config.dart'; +import 'package:bruno/src/theme/configs/brn_gallery_detail_config.dart'; +import 'package:bruno/src/theme/configs/brn_pair_info_config.dart'; +import 'package:bruno/src/theme/configs/brn_picker_config.dart'; +import 'package:bruno/src/theme/configs/brn_selection_config.dart'; +import 'package:bruno/src/theme/configs/brn_tabbar_config.dart'; +import 'package:bruno/src/theme/configs/brn_tag_config.dart'; /// 描述: 全局配置 /// diff --git a/lib/src/theme/configs/brn_appbar_config.dart b/lib/src/theme/configs/brn_appbar_config.dart index 0b605834..71e25312 100644 --- a/lib/src/theme/configs/brn_appbar_config.dart +++ b/lib/src/theme/configs/brn_appbar_config.dart @@ -1,9 +1,12 @@ // @dart=2.9 -import 'package:bruno/bruno.dart'; import 'package:bruno/src/components/navbar/brn_appbar_theme.dart'; +import 'package:bruno/src/constants/brn_asset_constants.dart'; import 'package:bruno/src/constants/brn_strings_constants.dart'; -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/base/brn_base_config.dart'; +import 'package:bruno/src/theme/base/brn_text_style.dart'; +import 'package:bruno/src/theme/brn_theme_configurator.dart'; +import 'package:bruno/src/theme/configs/brn_common_config.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/lib/src/theme/configs/brn_button_config.dart b/lib/src/theme/configs/brn_button_config.dart index 595a8a26..97464ebe 100644 --- a/lib/src/theme/configs/brn_button_config.dart +++ b/lib/src/theme/configs/brn_button_config.dart @@ -1,6 +1,8 @@ // @dart=2.9 -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/base/brn_base_config.dart'; +import 'package:bruno/src/theme/brn_theme_configurator.dart'; +import 'package:bruno/src/theme/configs/brn_common_config.dart'; /// 按钮基础配置 class BrnButtonConfig extends BrnBaseConfig { diff --git a/lib/src/theme/configs/brn_enhance_number_card_config.dart b/lib/src/theme/configs/brn_enhance_number_card_config.dart index 208f75fd..ed1e94f8 100644 --- a/lib/src/theme/configs/brn_enhance_number_card_config.dart +++ b/lib/src/theme/configs/brn_enhance_number_card_config.dart @@ -1,6 +1,9 @@ // @dart=2.9 -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/base/brn_base_config.dart'; +import 'package:bruno/src/theme/base/brn_text_style.dart'; +import 'package:bruno/src/theme/brn_theme_configurator.dart'; +import 'package:bruno/src/theme/configs/brn_common_config.dart'; /// 强化数字展示组件配置 class BrnEnhanceNumberCardConfig extends BrnBaseConfig { diff --git a/lib/src/theme/configs/brn_gallery_detail_config.dart b/lib/src/theme/configs/brn_gallery_detail_config.dart index cbb332a5..39a70461 100644 --- a/lib/src/theme/configs/brn_gallery_detail_config.dart +++ b/lib/src/theme/configs/brn_gallery_detail_config.dart @@ -1,7 +1,5 @@ // @dart=2.9 -import 'dart:ui'; - import 'package:bruno/src/components/navbar/brn_appbar_theme.dart'; import 'package:bruno/src/theme/base/brn_base_config.dart'; import 'package:bruno/src/theme/base/brn_text_style.dart'; diff --git a/lib/src/theme/configs/brn_pair_info_config.dart b/lib/src/theme/configs/brn_pair_info_config.dart index 30313791..2dc2cafa 100644 --- a/lib/src/theme/configs/brn_pair_info_config.dart +++ b/lib/src/theme/configs/brn_pair_info_config.dart @@ -1,6 +1,9 @@ // @dart=2.9 -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/base/brn_base_config.dart'; +import 'package:bruno/src/theme/base/brn_text_style.dart'; +import 'package:bruno/src/theme/brn_theme_configurator.dart'; +import 'package:bruno/src/theme/configs/brn_common_config.dart'; ///BrnPairInfoTable的配置文件 全局配置 class BrnPairInfoTableConfig extends BrnBaseConfig { diff --git a/lib/src/theme/configs/brn_tabbar_config.dart b/lib/src/theme/configs/brn_tabbar_config.dart index 733746c2..ddad9e1a 100644 --- a/lib/src/theme/configs/brn_tabbar_config.dart +++ b/lib/src/theme/configs/brn_tabbar_config.dart @@ -1,8 +1,9 @@ // @dart=2.9 -import 'dart:ui'; - -import 'package:bruno/src/theme/brn_theme.dart'; +import 'package:bruno/src/theme/base/brn_base_config.dart'; +import 'package:bruno/src/theme/base/brn_text_style.dart'; +import 'package:bruno/src/theme/brn_theme_configurator.dart'; +import 'package:bruno/src/theme/configs/brn_common_config.dart'; import 'package:flutter/material.dart'; /// TabBar配置类 diff --git a/lib/src/theme/img/brn_theme_default_utils.dart b/lib/src/theme/img/brn_theme_default_utils.dart index 0b5a301e..a5277403 100644 --- a/lib/src/theme/img/brn_theme_default_utils.dart +++ b/lib/src/theme/img/brn_theme_default_utils.dart @@ -1,7 +1,5 @@ // @dart=2.9 -import 'dart:ui'; - import 'package:bruno/src/constants/brn_asset_constants.dart'; import 'package:bruno/src/theme/img/brn_theme_img_utils.dart'; import 'package:bruno/src/utils/brn_tools.dart'; diff --git a/lib/src/theme/img/brn_theme_img_utils.dart b/lib/src/theme/img/brn_theme_img_utils.dart index 2f534298..79df82cf 100644 --- a/lib/src/theme/img/brn_theme_img_utils.dart +++ b/lib/src/theme/img/brn_theme_img_utils.dart @@ -1,7 +1,5 @@ // @dart=2.9 -import 'dart:ui'; - import 'package:flutter/material.dart'; abstract class BrnThemeImgUtils {