Theme: 优化单例实现，初步优化 BrnAllThemeConfig 属性获取不为 null (LianjiaTech#40)

* Theme: 优化单例实现，初步优化 BrnAllThemeConfig 属性获取不为 null * refactor:优化theme,暴露非null引用 * theme:去除无用信息及优化部分代码 * theme:增加属性类型
leftcoding · Jan 1, 2022 · 39ae13a · 39ae13a
1 parent 22ea22b
commit 39ae13a
Show file tree

Hide file tree

Showing 24 changed files with 2,655 additions and 1,591 deletions.
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -35,7 +35,7 @@ end
 target 'Runner' do
   use_frameworks!
   use_modular_headers!
-  
+
   # Flutter Pod
 
   copied_flutter_dir = File.join(__dir__, 'Flutter')

diff --git a/example/lib/sample/components/form/items_example/title_select_example.dart b/example/lib/sample/components/form/items_example/title_select_example.dart
@@ -47,7 +47,7 @@ class TitleSelectInputState extends State<TitleSelectInputExamplePage> {
               title: _list[0],
               hint: "请输入",
               controller: controller,
-              inputFormatters: [FilteringTextInputFormatter(RegExp('[0-9"]'))],
+              inputFormatters: [FilteringTextInputFormatter.digitsOnly],
               selectedIndex: -1,
               selectList: _list,
               onTip: () {

diff --git a/example/lib/sample/theme/config_test_utils.dart b/example/lib/sample/theme/config_test_utils.dart
@@ -158,16 +158,6 @@ class TestConfigUtils {
     titleMaxLength: 20,
     titleStyle: BrnTextStyle(color: Color(0xff222222), fontWeight: FontWeight.w600, fontSize: 24),
     actionsStyle: BrnTextStyle(color: Color(0xFF3072F6), fontWeight: FontWeight.w600, fontSize: 18),
-    flexibleSpace: Container(
-      width: double.infinity,
-      height: MediaQueryData.fromWindow(window).padding.top + 57,
-      decoration: BoxDecoration(
-        gradient: LinearGradient(colors: [
-          Color(0xfffafafa),
-          Color(0xfff5f5f5),
-        ], begin: Alignment.topCenter, end: Alignment.bottomCenter),
-      ),
-    ),
   );
 
   static BrnButtonConfig defaultButtonConfig = BrnButtonConfig(

diff --git a/lib/src/components/navbar/brn_appbar.dart b/lib/src/components/navbar/brn_appbar.dart
@@ -276,12 +276,12 @@ class BrnAppBar extends PreferredSize {
         .merge(_defaultConfig);
 
     Widget flexibleSpace;
-    if (_defaultConfig.flexibleSpace != null) {
+    if (this.flexibleSpace != null) {
       flexibleSpace = Container(
         height: _defaultConfig.appBarHeight +
                 MediaQueryData.fromWindow(window)?.padding?.top ??
             0,
-        child: _defaultConfig.flexibleSpace,
+        child: this.flexibleSpace,
       );
     }
 

diff --git a/lib/src/components/sugsearch/brn_search_text.dart b/lib/src/components/sugsearch/brn_search_text.dart
@@ -271,7 +271,7 @@ class _SearchTextState extends State<BrnSearchText> {
                       child: GestureDetector(
                         onTap: () {
                           if (widget.onTextClear != null) {
-                            bool isIntercept = widget.onTextClear!() ?? false;
+                            bool isIntercept = widget.onTextClear!();
                             if (isIntercept) return;
                           }
                           textEditingController!.clear();

diff --git a/lib/src/theme/base/brn_base_config.dart b/lib/src/theme/base/brn_base_config.dart
@@ -49,6 +49,5 @@ abstract class BrnBaseConfig {
       _currentLevelCommonConfig ??
       BrnThemeConfigurator.instance
           .getConfig(configId: configId)
-          .commonConfig ??
-      BrnDefaultConfigUtils.defaultCommonConfig;
+          .commonConfig;
 }