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

fix:actionsheet title is not null #128

Merged
merged 136 commits into from
Mar 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
f01fdc4
🚀 merge master to 2.2.x (#1)
Nayuta403 Dec 7, 2021
b96a551
perf: pass puv.dev static analysis
violinday Dec 8, 2021
834f6cd
perf: change the version number to 2.0.0
violinday Dec 8, 2021
09e4613
pref: upgrade third_party
zhoujuanjuan Dec 8, 2021
48a3a52
flutter 2.8.x support (#8)
laiiihz Dec 13, 2021
0e14055
Null safe (#13)
zhoujuanjuan Dec 15, 2021
9fdb8fd
upgrade dependencies:collection to stable
laiiihz Dec 16, 2021
814920b
migrate constants to null safety
laiiihz Dec 16, 2021
5991726
migrate brn_multi_click_util to null safety
laiiihz Dec 16, 2021
540d5ce
migrate font util to null safety
laiiihz Dec 16, 2021
5ed705a
migrate brn_text_style to null safety
laiiihz Dec 16, 2021
9f41f43
migrate brn picker constants to null safety
laiiihz Dec 16, 2021
577299f
migrate brn appBar theme to null safety
laiiihz Dec 16, 2021
39281ea
optimize bruno theme's import (#16)
laiiihz Dec 20, 2021
ae53073
♻️ [NNBD] Part 1. Migrate configs (#28)
AlexV525 Dec 22, 2021
97b8b77
♻️ [NNBD] Part 2. Migrate utils (#30)
AlexV525 Dec 22, 2021
458ba9d
优化radio_button的点击范围 (#31)
Passer-by Dec 22, 2021
43acef4
:art: BrnSearchText (#36)
kalifun Dec 27, 2021
d2a37e0
Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null
zhoujuanjuan Dec 27, 2021
75a2be3
refactor:优化theme,暴露非null引用
zhoujuanjuan Dec 27, 2021
f97bf07
theme:去除无用信息及优化部分代码
zhoujuanjuan Dec 28, 2021
44ba17a
theme:增加属性类型
zhoujuanjuan Dec 28, 2021
d4a4212
Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null (#40)
zhoujuanjuan Dec 29, 2021
886c48e
🎨 utils-EventBus添加null-safe (#23)
kkkman22 Dec 30, 2021
081a7dc
refactor brn_toast (#33)
leftcoding Dec 30, 2021
cad7451
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Dec 31, 2021
c19203f
优化修复 EventBus
zhoujuanjuan Dec 31, 2021
7dff62a
优化 EventBus 单例实现 (#43)
zhoujuanjuan Dec 31, 2021
974e0da
brn_toast time change to seconds (#45)
leftcoding Jan 4, 2022
c96cdd3
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 4, 2022
3ef1aa2
migrate brn_loading to null safety (#32)
laiiihz Jan 4, 2022
2c99d35
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 4, 2022
6a36110
optimization brn_theme_configurator instance constructor (#47)
leftcoding Jan 4, 2022
c7ae392
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 5, 2022
6e0834b
迁移example ,优化常量命名,增加export
zhoujuanjuan Jan 4, 2022
5db665d
migrate brn_empty_status.dart
zhoujuanjuan Jan 5, 2022
976d588
Migrate BrnStateTag、BrnTagCustom、BrnSelectTag、BrnDeleteTag to null-sa…
violinday Jan 5, 2022
7c12fc8
删除 BrnThemeImg
zhoujuanjuan Jan 6, 2022
0b75394
Merge remote-tracking branch 'upstream/null-safe' into null-safe
zhoujuanjuan Jan 6, 2022
c00cfd5
fix:tagConfig merge方法增加判空处理
zhoujuanjuan Jan 6, 2022
ada5216
fix:revert tagConfig
zhoujuanjuan Jan 7, 2022
beec378
fix:BrnAbnormalStateWidget空处理
zhoujuanjuan Jan 7, 2022
7d3ed35
reset and migrated package [rating] to null-safety. (#42)
jojinshallar Jan 7, 2022
0203e9f
迁移example ,优化常量命名,增加export (#51)
zhoujuanjuan Jan 7, 2022
b852eb6
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 7, 2022
6df9863
空安全报错修改 (#55)
HappyImp Jan 7, 2022
65a914e
优化sketch教程为视频教程
zhoujuanjuan Jan 10, 2022
e1a515e
优化sketch教程为视频教程
zhoujuanjuan Jan 10, 2022
96287c6
优化sketch教程为视频教程 (#61)
zhoujuanjuan Jan 10, 2022
46ec54a
Migrated package [selectcity] to null-safety (#56)
jojinshallar Jan 10, 2022
27dd619
migrate card_title to null safety (#59)
laiiihz Jan 10, 2022
e69a944
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 10, 2022
232f347
Migrated package [radio] to null-safety (#62)
jojinshallar Jan 11, 2022
e31532f
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 11, 2022
162fcfe
Migrated tabbar to null-safety
zhoujuanjuan Jan 11, 2022
fc0579a
Migrated package [guide] to null-safety (#65)
jojinshallar Jan 12, 2022
925350c
🚀 Use the latest Podfile for the example (#68)
AlexV525 Jan 12, 2022
4fe8680
Null safe calendar (#64)
laiiihz Jan 12, 2022
00c53b3
Card Components Null safe adapter (#53)
KennethYo Jan 12, 2022
2bd473f
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 12, 2022
103ab13
Migrated scroll_anchor to null-safety
zhoujuanjuan Jan 11, 2022
2c991c4
fix #71 (#77)
leftcoding Jan 13, 2022
2b141fd
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 13, 2022
7e25ffd
fix content_card themeData is not null (#79)
laiiihz Jan 13, 2022
2a4a43b
Null safe of all buttons (#20)
donywan Jan 14, 2022
8237c32
Migrated package [navbar][input] to null-safety (#75)
jojinshallar Jan 17, 2022
04b7a3e
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 17, 2022
5748da7
fix:修复迁移tabar问题
zhoujuanjuan Jan 17, 2022
244a957
Migrated tabbar & scroll_anchor to null-safety (#66)
zhoujuanjuan Jan 17, 2022
a8101d4
Migrate Selection to null-safe (#54)
violinday Jan 17, 2022
8c25d72
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 18, 2022
1c33fd9
migrate form to null safety
zhoujuanjuan Jan 18, 2022
07c308a
fix:修复tabbar报错及selection警告信息
zhoujuanjuan Jan 18, 2022
8e07cdf
Migrated package [dialog] to null-safety (#81)
jojinshallar Jan 19, 2022
fdf45af
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 19, 2022
488f70d
migrate brn_horizontal_steps、brn_step_line to null safety (#89)
leftcoding Jan 21, 2022
0704e89
migrate charts to null safety (#80)
laiiihz Jan 23, 2022
79cb687
migrate actionsheet into null-safe (#73)
junlandroid Jan 23, 2022
e1749fe
Merge remote-tracking branch 'upstream/null-safe' into null-safe
zhoujuanjuan Jan 24, 2022
0b4c168
fix:修复迁移问题
zhoujuanjuan Jan 24, 2022
3f3b4d3
fix:优化迁移部分问题key和style非空问题
zhoujuanjuan Jan 24, 2022
8344fb9
migrate form to null safety (#86)
zhoujuanjuan Jan 24, 2022
1b89f72
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 24, 2022
8b9e3ab
migrate picker to null safety
zhoujuanjuan Jan 24, 2022
8629bb0
migrate popup to null safety (#69)
hexintao Jan 24, 2022
04432c6
migrate gallery to null safety (#90)
Nayuta403 Jan 25, 2022
fbe085a
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 25, 2022
2d7fcc1
fix:修复picker空安全迁移问题
zhoujuanjuan Jan 25, 2022
49e9147
migrate appraise dir to null safety (#84)
hexintao Jan 25, 2022
a23e201
fix:修复list没指定泛型及if判断错误问题
zhoujuanjuan Jan 26, 2022
4fa42f7
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 26, 2022
33ed04a
fix:migrate dashed line to null safty
zhoujuanjuan Jan 26, 2022
a4c1a74
migrate picker to null safety (#91)
zhoujuanjuan Jan 26, 2022
d8234a9
replace DIN font with Bebas font (#87) (#92)
hexintao Jan 26, 2022
4300e62
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 26, 2022
069436d
migrate example to null safty
zhoujuanjuan Jan 26, 2022
3e28aa4
fix:修复部分example warning
zhoujuanjuan Jan 26, 2022
00f8a47
fix:修复demo报错问题
zhoujuanjuan Jan 27, 2022
8b17ba3
fix:追加未跟踪修复
zhoujuanjuan Jan 27, 2022
a526542
fix:优化部分接口可空参数为非空
zhoujuanjuan Jan 27, 2022
7add53d
Perf:Button Null safe (#93)
violinday Jan 27, 2022
966b63e
Merge branch 'null-safe' into null-safe
violinday Feb 7, 2022
5401fba
migrate example to null safety (#94)
zhoujuanjuan Feb 14, 2022
7028763
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Feb 14, 2022
4c62a0c
fix:修复tabar showmore overflow 问题 #98 以及 tabbar 标签颜色默认设置倒置问题
zhoujuanjuan Feb 16, 2022
140cd43
Fix #98 问题及优化部分代码 (#99)
zhoujuanjuan Feb 16, 2022
dcc5731
refactor:优化 BrnInputItemType 常量命名
zhoujuanjuan Feb 16, 2022
fb34dc0
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Feb 16, 2022
6b10b9c
refactor:优化枚举值命名
zhoujuanjuan Feb 16, 2022
589daf1
fix:修改docs目录下form相关常量命名及所有枚举命名
zhoujuanjuan Feb 16, 2022
a7ec085
优化 BrnInputItemType 常量命名 (#100)
zhoujuanjuan Feb 17, 2022
295b16a
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Feb 17, 2022
2ead0c1
refactor: 更新 changelog
zhoujuanjuan Feb 17, 2022
b67f8b9
Merge branch 'LianjiaTech:2.2.x' into 2.2.x
zhoujuanjuan Feb 17, 2022
f1d0efc
Merge remote-tracking branch 'origin/null-safe' into 2.2.x
zhoujuanjuan Feb 17, 2022
97f6a1f
refactor:BrnBubbleText 增加属性 bgColor、textStyle,修复demo actionSheet、gal…
zhoujuanjuan Feb 18, 2022
9748fac
fix:修复changelog 错误,brn_gallery_summary_page.dart 中标题空处理
zhoujuanjuan Feb 22, 2022
b0092e0
fix:修复部分问题
zhoujuanjuan Mar 4, 2022
d370e7b
fix:修复部分问题
zhoujuanjuan Mar 4, 2022
045a2d6
Merge remote-tracking branch 'origin/null-safe' into 2.2.x (#102)
zhoujuanjuan Mar 4, 2022
15a6f5d
migrate docs to null-safety
zhoujuanjuan Mar 7, 2022
9b9b02d
Merge remote-tracking branch 'upstream/2.2.x' into 2.2.x
zhoujuanjuan Mar 7, 2022
c1aa482
feat:changelog 增加 BrnHorizontalStepsManager 改动
zhoujuanjuan Mar 7, 2022
40f66f3
fix:优化changelog
zhoujuanjuan Mar 9, 2022
f5527d1
Merge remote-tracking branch 'origin/2.2.x'
zhoujuanjuan Mar 9, 2022
a073c4f
fix:修复检测出的info&warning
zhoujuanjuan Mar 10, 2022
13b7ada
Merge branch 'LianjiaTech:master' into master
zhoujuanjuan Mar 10, 2022
39da48f
fix:code style format and update changelog
zhoujuanjuan Mar 10, 2022
dc9ef85
Merge branch 'LianjiaTech:master' into master
zhoujuanjuan Mar 10, 2022
519f7a8
Merge branch 'LianjiaTech:master' into master
zhoujuanjuan Mar 10, 2022
3f9a304
fix:修复自定义弹窗view 错误
zhoujuanjuan Mar 10, 2022
3224c0d
update version to 2.1.0-nullsafety.0
zhoujuanjuan Mar 11, 2022
2ed6757
Merge branch 'LianjiaTech:master' into master
zhoujuanjuan Mar 11, 2022
97877b9
update changelog
zhoujuanjuan Mar 11, 2022
01b6792
fix:actionsheet title is not null
zhoujuanjuan Mar 11, 2022
b1819eb
Merge branch 'LianjiaTech:master' into master
zhoujuanjuan Mar 11, 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
4 changes: 2 additions & 2 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ dependencies:
flutter_easyrefresh: ^2.2.1
lpinyin: ^2.0.3
badges: ^2.0.2
intl: ^0.17.0

dev_dependencies:
flutter_test:
sdk: flutter

dependency_overrides:
intl: ^0.17.0

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec

Expand Down
41 changes: 17 additions & 24 deletions lib/src/components/actionsheet/brn_common_action_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ enum BrnCommonActionSheetItemStyle {

class BrnCommonActionSheetItem {
/// 标题文字
String? title;
String title;

/// 辅助信息
String? desc;
Expand Down Expand Up @@ -232,31 +232,24 @@ class BrnCommonActionSheet extends StatelessWidget {
// action 每个item配置项 [BrnCommonActionSheetItem]
Widget _configTile(BrnCommonActionSheetItem action) {
List<Widget> tileElements = [];
bool hasTitle = false;
// 如果有标题则添加标题
if (action.title != null) {
tileElements.add(Center(
child: Text(
action.title!,
maxLines: 1,
style: action.titleStyle ??
(action.actionStyle == BrnCommonActionSheetItemStyle.alert
? this.themeData!.itemTitleStyleAlert.generateTextStyle()
: (action.actionStyle == BrnCommonActionSheetItemStyle.link
? this.themeData!.itemTitleStyleLink.generateTextStyle()
: this.themeData!.itemTitleStyle.generateTextStyle())),
),
));
hasTitle = true;
}
// 添加标题
tileElements.add(Center(
child: Text(
action.title,
maxLines: 1,
style: action.titleStyle ??
(action.actionStyle == BrnCommonActionSheetItemStyle.alert
? this.themeData!.itemTitleStyleAlert.generateTextStyle()
: (action.actionStyle == BrnCommonActionSheetItemStyle.link
? this.themeData!.itemTitleStyleLink.generateTextStyle()
: this.themeData!.itemTitleStyle.generateTextStyle())),
),
));
// 如果有辅助信息则添加辅助信息
if (action.desc != null) {
// 如果有标题添加间距
if (hasTitle) {
tileElements.add(SizedBox(
height: 2,
));
}
tileElements.add(SizedBox(
height: 2,
));
tileElements.add(
Center(
child: Text(
Expand Down