Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace DIN font with Bebas font #87

Merged
merged 1 commit into from
Jan 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/fonts/Bebas-Regular.ttf
Binary file not shown.
Binary file removed assets/fonts/DINCondensed-Bold.ttf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,13 @@ class _NumberItemRowExampleState extends State<NumberItemRowExample> {
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(
Expand All @@ -204,12 +205,13 @@ class _NumberItemRowExampleState extends State<NumberItemRowExample> {
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(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/sample/theme/config_test_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ class TestConfigUtils {

/// 文本字号
///
/// 特殊数据展示,DIN Condensed数字字体,用于强吸引
fontSizeDIN: 28,
/// 特殊数据展示,Bebas 数字字体,用于强吸引
fontSizeBebas: 28,

/// 标题字体
/// 名称/页面大标题
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
6 changes: 3 additions & 3 deletions lib/src/theme/base/brn_default_config_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ class BrnDefaultConfigUtils {

/// 文本字号
///
/// 特殊数据展示,DIN Condensed数字字体,用于强吸引
fontSizeDIN: 28,
/// 特殊数据展示,Bebas 数字字体,用于强吸引
fontSizeBebas: 28,

/// 标题字体
/// 名称/页面大标题
Expand Down Expand Up @@ -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,
);
Expand Down
10 changes: 5 additions & 5 deletions lib/src/theme/configs/brn_common_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ class BrnCommonConfig extends BrnBaseConfig {

/// 文本字号
///
/// 特殊数据展示,DIN Condensed数字字体,用于强吸引
/// 特殊数据展示,Bebas 数字字体,用于强吸引
/// default value is 28
double fontSizeDIN;
double fontSizeBebas;

/// 标题字体
/// 名称/页面大标题
Expand Down Expand Up @@ -234,7 +234,7 @@ class BrnCommonConfig extends BrnBaseConfig {
this.fillMask,
this.borderColorBase,
this.dividerColorBase,
this.fontSizeDIN,
this.fontSizeBebas,
this.fontSizeHeadLg,
this.fontSizeBase,
this.fontSizeHead,
Expand Down Expand Up @@ -289,7 +289,7 @@ class BrnCommonConfig extends BrnBaseConfig {
this.fillMask,
this.borderColorBase,
this.dividerColorBase,
this.fontSizeDIN,
this.fontSizeBebas,
this.fontSizeHeadLg,
this.fontSizeBase,
this.fontSizeHead,
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down