diff --git a/CHANGELOG.md b/CHANGELOG.md index f76eb609..f7459db8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,4 @@ - - -## [2.1.0-Beta] - 2022-2-15 +## [2.1.0-nullsafety.0] - 2022-3-10 ### Changed #### base @@ -12,11 +10,14 @@ #### components - **Breaking change**: remove BrnHorizontalStepsManager and put function forwardStep() backStep() into BrnStepsController thanks to leftcoding. +- **Breaking change**: remove BrnDialogStyle and replace with BrnDialogConfig. - BrnCalendarView: add BrnCalendarView.single() and BrnCalendarView.range() constructor and had its argument startEndDateChange removed. - BrnSelectionEntityListBean: fromMap is renamed to fromJson. - BrnRadioButton: optimize click area [#31](https://github.com/LianjiaTech/bruno/pull/31) , thanks to **a1017480401** . - BrnScrollableTextDialog: remove Navigator.pop(context) in onSubmit() and hand it over to external processing (user). -- BrnBubbleText: add attribute bgColor and textStyle +- BrnBubbleText: add attribute bgColor and textStyle. +- BrnPairInfoTable: add attribute defaultVerticalAlignment. +- BrnDialog: remove BrnDialogStyle and replace with BrnDialogConfig. @@ -41,4 +42,3 @@ Thanks again to **leftcoding**, **jojinshallar**, **laiiihz**, **donywan**, - First publish adapt flutter sdk 1.22.4 - diff --git a/README.en-US.md b/README.en-US.md index 09a74976..6571c9bd 100644 --- a/README.en-US.md +++ b/README.en-US.md @@ -48,7 +48,7 @@ If you cannot access the demo, you can directly watch [Overview](https://github. | ---------- | ---------------- | | 1.0.0 | 1.22.4 | | 2.0.0 | 2.2.2 | -| 2.1.0 | 2.2.2-null safety | +| 2.1.0-nullsafety.0 | 2.2.2 | > Attention although we have adapted version 2.2.2, support for null-safe is in the works. We'll keep you updated on github as soon as possible, so stay tuned to 🙂. diff --git a/README.md b/README.md index 5a6b8df6..2b5fe56a 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ | ---------- | ---------------- | | 1.0.0 | 1.22.4 | | 2.0.0 | 2.2.2 | -| 2.1.0 | 2.2.2-null safety | +| 2.1.0-nullsafety.0 | 2.2.2 | diff --git a/example/lib/sample/components/selection/selectionview_customview_example_page.dart b/example/lib/sample/components/selection/selectionview_customview_example_page.dart index 8831c95a..dda5e422 100644 --- a/example/lib/sample/components/selection/selectionview_customview_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_customview_example_page.dart @@ -43,7 +43,7 @@ class _SelectionViewExamplePageState @override void initState() { _currentCalendarSelectedDate = - ValueNotifier(DateTimeFormatter.convertStringToDate(_dateForamt, _filterSelectedDate!)); + ValueNotifier(DateTimeFormatter.convertStringToDate(_dateForamt, _filterSelectedDate)); super.initState(); } @@ -118,7 +118,7 @@ class _SelectionViewExamplePageState _currentCalendarSelectedDate = ValueNotifier( DateTimeFormatter.convertStringToDate( - _dateForamt, _filterSelectedDate!)); + _dateForamt, _filterSelectedDate)); var content = Column(children: [ Flexible( diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9774b1ac..9ee2224b 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -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 diff --git a/lib/src/components/actionsheet/brn_common_action_sheet.dart b/lib/src/components/actionsheet/brn_common_action_sheet.dart index f3c4a41e..d0e297f8 100644 --- a/lib/src/components/actionsheet/brn_common_action_sheet.dart +++ b/lib/src/components/actionsheet/brn_common_action_sheet.dart @@ -23,7 +23,7 @@ enum BrnCommonActionSheetItemStyle { class BrnCommonActionSheetItem { /// 标题文字 - String? title; + String title; /// 辅助信息 String? desc; @@ -232,31 +232,24 @@ class BrnCommonActionSheet extends StatelessWidget { // action 每个item配置项 [BrnCommonActionSheetItem] Widget _configTile(BrnCommonActionSheetItem action) { List 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( diff --git a/pubspec.yaml b/pubspec.yaml index 0ca04a1f..15ae855e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: bruno description: An enterprise-class package of Flutter components for mobile applications. -version: 2.1.0 +version: 2.1.0-nullsafety.0 homepage: https://github.com/LianjiaTech/bruno environment: