replace DIN font with Bebas font

LianjiaTech · Jan 18, 2022 · 2db0a10 · 2db0a10
1 parent 673d7c9
commit 2db0a10
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/assets/fonts/Bebas-Regular.ttf b/assets/fonts/Bebas-Regular.ttf
diff --git a/assets/fonts/DINCondensed-Bold.ttf b/assets/fonts/DINCondensed-Bold.ttf
diff --git a/example/lib/sample/components/card/content/number_item_example.dart b/example/lib/sample/components/card/content/number_item_example.dart
@@ -174,7 +174,7 @@ class _NumberItemRowExampleState extends State<NumberItemRowExample> {
                         textBaseline: TextBaseline.alphabetic,
                         children: <Widget>[
                           Container(
-                            height: 26,
+                            height: 30,
                             transform: Matrix4.translationValues(0, 1, 0),
                             child: Text('3',
                                 style: TextStyle(
@@ -183,7 +183,7 @@ class _NumberItemRowExampleState extends State<NumberItemRowExample> {
                                   package: BrnStrings.flutterPackageName,
                                   fontWeight: FontWeight.w600,
                                   fontSize: 28,
-                                  fontFamily: 'Condensed',
+                                  fontFamily: 'Bebas',
                                 )),
                           ),
                           Padding(
@@ -200,7 +200,7 @@ class _NumberItemRowExampleState extends State<NumberItemRowExample> {
                             ),
                           ),
                           Container(
-                            height: 26,
+                            height: 30,
                             transform: Matrix4.translationValues(0, 1, 0),
                             child: Text('1',
                                 style: TextStyle(
@@ -209,7 +209,7 @@ class _NumberItemRowExampleState extends State<NumberItemRowExample> {
                                   package: BrnStrings.flutterPackageName,
                                   fontWeight: FontWeight.w600,
                                   fontSize: 28,
-                                  fontFamily: 'Condensed',
+                                  fontFamily: 'Bebas',
                                 )),
                           ),
                           Padding(

diff --git a/example/lib/sample/theme/config_test_utils.dart b/example/lib/sample/theme/config_test_utils.dart
@@ -78,7 +78,7 @@ class TestConfigUtils {
 
     /// 文本字号
     ///
-    /// 特殊数据展示，DIN Condensed数字字体，用于强吸引
+    /// 特殊数据展示，Bebas 数字字体，用于强吸引
     fontSizeDIN: 28,
 
     /// 标题字体

diff --git a/lib/src/components/card/content_card/brn_enhance_number_card.dart b/lib/src/components/card/content_card/brn_enhance_number_card.dart
@@ -205,7 +205,7 @@ class BrnEnhanceNumberCard extends StatelessWidget {
       children: <Widget>[
         _getPreWidget(model.preDesc, config),
         Container(
-          height: 26,
+          height: 30,
           transform: Matrix4.translationValues(0, 1, 0),
           child: Text(model.number,
               style: TextStyle(
@@ -214,7 +214,7 @@ class BrnEnhanceNumberCard extends StatelessWidget {
                 package: BrnStrings.flutterPackageName,
                 fontWeight: config.titleTextStyle.fontWeight,
                 fontSize: config.titleTextStyle.fontSize,
-                fontFamily: 'Condensed',
+                fontFamily: 'Bebas',
               )),
         ),
         _getLastWidget(model.lastDesc, config),

diff --git a/lib/src/theme/base/brn_default_config_utils.dart b/lib/src/theme/base/brn_default_config_utils.dart
@@ -112,7 +112,7 @@ class BrnDefaultConfigUtils {
 
     /// 文本字号
     ///
-    /// 特殊数据展示，DIN Condensed数字字体，用于强吸引
+    /// 特殊数据展示，Bebas 数字字体，用于强吸引
     fontSizeDIN: 28,
 
     /// 标题字体

diff --git a/lib/src/theme/configs/brn_common_config.dart b/lib/src/theme/configs/brn_common_config.dart
@@ -100,7 +100,7 @@ class BrnCommonConfig extends BrnBaseConfig {
 
   /// 文本字号
   ///
-  /// 特殊数据展示，DIN Condensed数字字体，用于强吸引
+  /// 特殊数据展示，Bebas 数字字体，用于强吸引
   /// default value is 28
   double fontSizeDIN;
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -56,9 +56,9 @@ flutter:
   # list giving the asset and other descriptors for the font. For
   # example:
   fonts:
-     - family: Condensed
+     - family: Bebas
        fonts:
-         - asset: assets/fonts/DINCondensed-Bold.ttf
+         - asset: assets/fonts/Bebas-Regular.ttf
 #           weight: 700
   #   - family: Trajan Pro
   #     fonts: