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.

Sign up for GitHub

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

fix global style BrnCardTitleConfig don't work (#310) #313

Merged
merged 2 commits into from
Sep 13, 2022
Merged

fix global style BrnCardTitleConfig don't work (#310) #313

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbc1d64
fix global style BrnCardTitleConfig don't work (#310)
JayceV552 Aug 25, 2022
2f670d0
update merge style order
JayceV552 Sep 5, 2022
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
11 changes: 6 additions & 5 deletions lib/src/components/card_title/brn_common_card_title.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class BrnCommonCardTitle extends StatelessWidget {
/// 标题下方文字 默认是深色的222222
final Color? detailColor;

/// 内容的padding 默认上下16 左右0
/// 内容的padding 默认上16下12 左右0
final EdgeInsetsGeometry? padding;

/// 标题最大行数
Expand All @@ -95,22 +95,23 @@ class BrnCommonCardTitle extends StatelessWidget {
this.padding,
this.titleMaxLines,
this.titleOverflow = TextOverflow.clip,
this.themeData})
this.themeData})
: super(key: key);

@override
Widget build(BuildContext context) {
BrnCardTitleConfig defaultConfig = themeData ?? BrnCardTitleConfig();

defaultConfig = defaultConfig.merge(BrnCardTitleConfig(
BrnCardTitleConfig cardTitleConfig = BrnCardTitleConfig(
alignment: alignment,
cardTitlePadding: padding as EdgeInsets?,
detailTextStyle: BrnTextStyle(color: detailColor)));
detailTextStyle: BrnTextStyle(color: detailColor));

defaultConfig = BrnThemeConfigurator.instance
.getConfig(configId: defaultConfig.configId)
.cardTitleConfig
.merge(defaultConfig);
.merge(cardTitleConfig)
.merge(themeData);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

需要确认下，组件构造函数参数的优先级＞ themeData ＞ 默认全局配置
：）

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, 已修正


Widget titleContainer = Container(
color: defaultConfig.cardBackgroundColor,
Expand Down