Skip to content

Commit

Permalink
Merge branch '2.2.x'
Browse files Browse the repository at this point in the history
* 2.2.x:
  update version to 2.1.0-nullsafety (#165)

# Conflicts:
#	README.en-US.md
#	README.md
#	pubspec.yaml
  • Loading branch information
violinday committed Apr 1, 2022
2 parents c23ee95 + e461cac commit 93ea6fe
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 14 deletions.
9 changes: 0 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


## [2.1.0-nullsafety] - 2022-4-1

### Changed
Expand Down Expand Up @@ -28,19 +26,12 @@
### Fixed

- Fix example error [#71](https://github.com/LianjiaTech/bruno/issues/71) thanks to **leftcoding** fixing this issue.

- Fix <code>BrnPickerTitleConfig</code> <code>titleContent</code> setting is invalid [#70](https://github.com/LianjiaTech/bruno/issues/70).

- Optimize <code>BrnPopupWindow </code> <code>onItemClick</code> logic [#57 ](https://github.com/LianjiaTech/bruno/issues/57) .

- Fix <code>BrnDialog</code> is obscured by keyboard [#7](https://github.com/LianjiaTech/bruno/issues/7) .

- Fix <code>BrnTextSelectFormItem</code> set <code>titlePaddingLg</code> doesn't work [#108](https://github.com/LianjiaTech/bruno/issues/108).

- Fix the bottom text of <code>BrnBottomTabBar</code> cannot be displayed in some cases [#141](https://github.com/LianjiaTech/bruno/issues/141).



Thanks again to **leftcoding**, **jojinshallar**, **laiiihz**, **donywan**, **kalifun**, **junlandroid**, **Kenneth**, **HappyImp**, **kkkman22** , **a1017480401** and **Alex**.


Expand Down
4 changes: 1 addition & 3 deletions README.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +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-nullsafety.1 | 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 🙂.
| 2.1.0-nullsafety | 2.2.2 |


## Preparing for use
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
| ---------- | ---------------- |
| 1.0.0 | 1.22.4 |
| 2.0.0 | 2.2.2 |
| 2.1.0-nullsafety.1 | 2.2.2 |
| 2.1.0-nullsafety | 2.2.2 |



Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: bruno
description: An enterprise-class package of Flutter components for mobile applications.
version: 2.1.0-nullsafety.1
version: 2.1.0-nullsafety
homepage: https://github.com/LianjiaTech/bruno

environment:
Expand Down

0 comments on commit 93ea6fe

Please sign in to comment.