diff --git a/assets/fonts/Bebas-Regular.ttf b/assets/fonts/Bebas-Regular.ttf new file mode 100644 index 00000000..d2e62a27 Binary files /dev/null and b/assets/fonts/Bebas-Regular.ttf differ diff --git a/assets/fonts/DINCondensed-Bold.ttf b/assets/fonts/DINCondensed-Bold.ttf deleted file mode 100644 index f05a1a96..00000000 Binary files a/assets/fonts/DINCondensed-Bold.ttf and /dev/null differ diff --git a/example/lib/sample/components/card/content/number_item_example.dart b/example/lib/sample/components/card/content/number_item_example.dart index 07bbba84..552ee602 100644 --- a/example/lib/sample/components/card/content/number_item_example.dart +++ b/example/lib/sample/components/card/content/number_item_example.dart @@ -178,12 +178,13 @@ class _NumberItemRowExampleState extends State { transform: Matrix4.translationValues(0, 1, 0), child: Text('3', style: TextStyle( + height: 1.0, textBaseline: TextBaseline.ideographic, color: Color(0xFF222222), package: BrnStrings.flutterPackageName, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w500, fontSize: 28, - fontFamily: 'Condensed', + fontFamily: 'Bebas', )), ), Padding( @@ -204,12 +205,13 @@ class _NumberItemRowExampleState extends State { transform: Matrix4.translationValues(0, 1, 0), child: Text('1', style: TextStyle( + height: 1.0, textBaseline: TextBaseline.ideographic, color: Color(0xFF222222), 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 index f91dd885..7837353d 100644 --- a/example/lib/sample/theme/config_test_utils.dart +++ b/example/lib/sample/theme/config_test_utils.dart @@ -78,8 +78,8 @@ class TestConfigUtils { /// 文本字号 /// - /// 特殊数据展示，DIN Condensed数字字体，用于强吸引 - fontSizeDIN: 28, + /// 特殊数据展示，Bebas 数字字体，用于强吸引 + fontSizeBebas: 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 index 79a1b4fa..c10555f0 100644 --- a/lib/src/components/card/content_card/brn_enhance_number_card.dart +++ b/lib/src/components/card/content_card/brn_enhance_number_card.dart @@ -209,12 +209,13 @@ class BrnEnhanceNumberCard extends StatelessWidget { transform: Matrix4.translationValues(0, 1, 0), child: Text(model.number, style: TextStyle( + height: 1.0, textBaseline: TextBaseline.ideographic, color: config.titleTextStyle.color, 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 index 16bd3ee8..b73ecfed 100644 --- a/lib/src/theme/base/brn_default_config_utils.dart +++ b/lib/src/theme/base/brn_default_config_utils.dart @@ -112,8 +112,8 @@ class BrnDefaultConfigUtils { /// 文本字号 /// - /// 特殊数据展示，DIN Condensed数字字体，用于强吸引 - fontSizeDIN: 28, + /// 特殊数据展示，Bebas 数字字体，用于强吸引 + fontSizeBebas: 28, /// 标题字体 /// 名称/页面大标题 @@ -471,7 +471,7 @@ class BrnDefaultConfigUtils { static BrnEnhanceNumberCardConfig defaultNumberInfoConfig = BrnEnhanceNumberCardConfig( runningSpace: 16, itemRunningSpace: 8, - titleTextStyle: BrnTextStyle(fontSize: 28, fontWeight: FontWeight.w600), + titleTextStyle: BrnTextStyle(fontSize: 28, fontWeight: FontWeight.w500), descTextStyle: BrnTextStyle(fontSize: 12, color: defaultCommonConfig.colorTextSecondary), dividerWidth: 0.5, ); diff --git a/lib/src/theme/configs/brn_common_config.dart b/lib/src/theme/configs/brn_common_config.dart index ccbcdeb0..940335fe 100644 --- a/lib/src/theme/configs/brn_common_config.dart +++ b/lib/src/theme/configs/brn_common_config.dart @@ -100,9 +100,9 @@ class BrnCommonConfig extends BrnBaseConfig { /// 文本字号 /// - /// 特殊数据展示，DIN Condensed数字字体，用于强吸引 + /// 特殊数据展示，Bebas 数字字体，用于强吸引 /// default value is 28 - double fontSizeDIN; + double fontSizeBebas; /// 标题字体 /// 名称/页面大标题 @@ -234,7 +234,7 @@ class BrnCommonConfig extends BrnBaseConfig { this.fillMask, this.borderColorBase, this.dividerColorBase, - this.fontSizeDIN, + this.fontSizeBebas, this.fontSizeHeadLg, this.fontSizeBase, this.fontSizeHead, @@ -289,7 +289,7 @@ class BrnCommonConfig extends BrnBaseConfig { this.fillMask, this.borderColorBase, this.dividerColorBase, - this.fontSizeDIN, + this.fontSizeBebas, this.fontSizeHeadLg, this.fontSizeBase, this.fontSizeHead, @@ -347,7 +347,7 @@ class BrnCommonConfig extends BrnBaseConfig { this.brandImportantValue ??= commonConfig.brandImportantValue; this.borderColorBase ??= commonConfig.borderColorBase; this.dividerColorBase ??= commonConfig.dividerColorBase; - this.fontSizeDIN ??= commonConfig.fontSizeDIN; + this.fontSizeBebas ??= commonConfig.fontSizeBebas; this.fontSizeHeadLg ??= commonConfig.fontSizeHeadLg; this.fontSizeBase ??= commonConfig.fontSizeBase; this.fontSizeHead ??= commonConfig.fontSizeHead; diff --git a/pubspec.yaml b/pubspec.yaml index c3d1c5f3..890098cb 100644 --- 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: