Skip to content

Commit

Permalink
Merge branch '3.x' into master
Browse files Browse the repository at this point in the history
* 3.x:
  cherry-pick: e868c57 [e868c57]
  add setting page (#388)
  sync docs (#385)
  fix enhance_number_card  item has different heights (#386)
  fix i18n exception, perf i18n demo (#387)
  perf: perf PickerTitle、AppBar hitTest area. (#383)
  refactor: 优化部分代码 (#378)
  fix textInputAction error (#379)
  支持本地化能力 (#279)
  brn_text_input_item组件使用textInputAction属性 (#367)
  fix gif image show error
  fix setting orign mode overflow
  add yDialMax > yDialMin limit
  fix showDatePicker notes
  expend BrnMultiSelectListPicker data
  • Loading branch information
violinday committed Dec 29, 2022
2 parents c9b1049 + b8f90d9 commit ac3bd85
Show file tree
Hide file tree
Showing 137 changed files with 1,879 additions and 847 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@


## [3.2.0] - 2022-12-29

### Changed

#### base

- support for localization capabilities.
- add pad theme configuration.
- expend title click area in pickers [#369](https://github.com/LianjiaTech/bruno/issues/369).

#### components

- <code>BrnMultiSelectListPicker</code> : add generics for more flexible data transfer [#336](https://github.com/LianjiaTech/bruno/issues/336) .
- <code>BrnLinePainter</code> : add the limit of yDialMax > yDialMin to fix the NaN error when calculating the path [359](https://github.com/LianjiaTech/bruno/issues/359).
- <code>BrnTabBar</code> : fix the overflow error when setting <code>BrnTabBarBadgeMode.origin</code> mode [#340](https://github.com/LianjiaTech/bruno/issues/340).
- <code>BrnAppraise</code>: fix gif file error [#372](https://github.com/LianjiaTech/bruno/issues/372).
- <code>BrnTextInputFormItem</code>: fix attribute <code>textInputAction</code> does not take effect and add attribute <code>obscureText</code>, thank to **echo-LuGuang**.
- <code>BrnAppBar</code>: expand <code>BrnTextAction</code> click area.
- <code>BrnEnhanceNumberCard</code>: fix the number card is not centered [#380](https://github.com/LianjiaTech/bruno/issues/380).



## [3.1.0] - 2022-9-30

### Changed
Expand Down
48 changes: 28 additions & 20 deletions README.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Please download from [Releases](https://github.com/LianjiaTech/bruno/releases) o
| 2.2.0 | 2.10.5 |
| 3.0.0 | 3.0.3 |
| 3.1.0 | 3.3.0 |
| 3.2.0 | 3.3.0 |


## Preparing for use
Expand Down Expand Up @@ -89,64 +90,71 @@ Please read our [Contributing](https://bruno.ke.com/page/guide/contribution) fir
Thanks to all the developers who contributed to Bruno !

<div style="display:flex;flex-wrap: wrap;">

<a href="https://github.com/violinday">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664602.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9434515?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/zhoujuanjuan">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664928.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/4566284?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/hexintao">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664290.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/15339683?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/ShzMinato">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664590.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/24968882?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/Nayuta403">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664273.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/40540394?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/leftcoding">
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/7122926?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/AlexV525">
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/15884415?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/liroya2003">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637736846398.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/11550773?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/lifuqing">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664429.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/2088673?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/visitorvisit">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664282.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/30320214?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/DNACore">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664426.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/7811286?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/SlamDunk007">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664914.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/13640766?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/zadouyoune">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664629.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9626570?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/quanGitHub1">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664641.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/15058841?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/bill19">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664536.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9607083?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/MichaelWon">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664633.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/13557870?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/laoshubuluo">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664320.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/14070606?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/eason-lz">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664460.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/5070735?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/coolsining">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664465.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/74528729?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/765227120">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637740374486.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/10770966?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/xzj524">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664906.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/10611023?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
</div>
</div>



Expand Down
48 changes: 28 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
| 2.2.0 | 2.10.5 |
| 3.0.0 | 3.0.3 |
| 3.1.0 | 3.3.0 |
| 3.2.0 | 3.3.0 |



Expand Down Expand Up @@ -90,64 +91,71 @@ BrnBubbleText(
感谢所有为 Bruno 做出贡献的开发者!

<div style="display:flex;flex-wrap: wrap;">

<a href="https://github.com/violinday">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664602.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9434515?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/zhoujuanjuan">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664928.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/4566284?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/hexintao">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664290.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/15339683?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/ShzMinato">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664590.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/24968882?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/Nayuta403">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664273.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/40540394?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/leftcoding">
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/7122926?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/AlexV525">
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/15884415?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/liroya2003">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637736846398.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/11550773?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/lifuqing">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664429.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/2088673?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/visitorvisit">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664282.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/30320214?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/DNACore">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664426.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/7811286?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/SlamDunk007">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664914.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/13640766?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/zadouyoune">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664629.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9626570?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/quanGitHub1">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664641.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/15058841?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/bill19">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664536.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9607083?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/MichaelWon">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664633.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/13557870?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/laoshubuluo">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664320.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/14070606?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/eason-lz">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664460.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/5070735?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/coolsining">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664465.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/74528729?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/765227120">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637740374486.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/10770966?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
<a href="https://github.com/xzj524">
<img src='https://img.ljcdn.com/beike/zjz/bruno/img/1637739664906.png' />
<img src='https://images.weserv.nl/?url=avatars.githubusercontent.com/u/10611023?v=4&h=64&w=64&fit=cover&mask=circle&maxage=7d' />
</a>
</div>
</div>


## 🔗 链接
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ BrnAbnormalStateWidget(
scale: 3.0,
),
isCenterVertical: true,
title: BrnStrings.getDateFailed,
operateTexts: <String>[BrnStrings.clickPageRetry],
operateAreaType: OperateAreaType.TextButton,
title: "获取数据失败,请重试",
operateTexts: <String>["请点击页面重试"],
operateAreaType: OperateAreaType.textButton,
action: (index) {
BrnToast.show(BrnStrings.getDateFailed, context);
BrnToast.show("获取数据失败,请重试", context);
},
)
```
Expand Down
6 changes: 3 additions & 3 deletions doc/components/appraise/BrnAppraise/BrnAppraise.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ BrnAppraise(
this.title = '',
this.headerType = BrnAppraiseHeaderType.spaceBetween,
this.type = BrnAppraiseType.Star,
this.iconDescriptions = _defaultIconDescriptions,
this.iconDescriptions,
this.tags,
this.inputHintText = '',
this.onConfirm,
Expand All @@ -97,7 +97,7 @@ BrnAppraise(
| title | String | 标题 || '' |
| headerType | BrnAppraiseHeaderType | 标题类型,居中还是两侧 || BrnAppraiseHeaderType.spaceBetween |
| type | BrnAppraiseType | 评价组件类型,表情包还是五角星 || BrnAppraiseType.Star |
| iconDescriptions | `List<String>` | 点击表情时对应等级的提示文案。若 `type=BrnAppraiseType.Emoji`,则 list 长度为 5,不足 5 个时请在对应位置补空字符串。若 `type=BrnAppraiseType.Star`,list 长度不能比传入的 BrnAppraiseConfig 中的 count 小。 || ['不好','还行','满意','很棒','超惊喜'] |
| iconDescriptions | `List<String>?` | 点击表情时对应等级的提示文案。若 `type=BrnAppraiseType.Emoji`,则 list 长度为 5,不足 5 个时请在对应位置补空字符串。若 `type=BrnAppraiseType.Star`,list 长度不能比传入的 BrnAppraiseConfig 中的 count 小。 || 默认值为国际化配置的数组,['不好','还行','满意','很棒','超惊喜'] |
| tags | `List<String>?` | 供选择的标签数据 |||
| inputHintText | String | 输入框的提示文字 || '' |
| onConfirm | BrnAppraiseConfirmClick? | 点击提交时的回调,其中 index 是选中的表情或者五角星的 index,selectedTags 是选中的标签,input 是输入框的内容 |||
Expand Down Expand Up @@ -125,7 +125,7 @@ BrnAppraise(
| inputDefaultText | String? | 输入框默认文案 |||
| inputMaxHeight | double | 输入框的最大高度 || 120 |
| showConfirmButton | bool | 是否显示提交按钮 || true |
| confirmButtonText | String | 提交按钮自定义文案 || '提交' |
| confirmButtonText | String? | 提交按钮自定义文案 || 默认值为国际化配置文本,'提交' |
| isConfirmButtonEnabled | bool | 提交按钮的可用状态 || 默认 null,在打分之后 enable |
| iconClickCallback | BrnAppraiseIconClick? | 点击打分时的回调 |||
| inputTextChangeCallback | BrnInputTextChangeCallback? | 输入框内容改变的回调 |||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ BrnAppraiseBottomPicker({
this.title = '',
this.headerType = BrnAppraiseHeaderType.spaceBetween,
this.type = BrnAppraiseType.Star,
this.iconDescriptions = _defaultIconDescriptions,
this.iconDescriptions,
this.tags,
this.inputHintText = '',
this.onConfirm,
Expand All @@ -43,7 +43,7 @@ BrnAppraiseBottomPicker({
| title | String | 标题 || '' |
| headerType | BrnAppraiseHeaderType | 标题类型,居中还是两侧 || BrnAppraiseHeaderType.spaceBetween |
| type | BrnAppraiseType | 评价组件类型,表情包还是五角星 || BrnAppraiseType.Star |
| iconDescriptions | `List<String>` | 点击表情时对应等级的提示文案。若 `type=BrnAppraiseType.Emoji`,则list长度为5,不足5个时请在对应位置补空字符串。若 `type=BrnAppraiseType.Star`,list长度不能比传入的 BrnAppraiseConfig中的 count 小。 || ['不好', '还行', '满意', '很棒', '超惊喜'] |
| iconDescriptions | `List<String>?` | 点击表情时对应等级的提示文案。若 `type=BrnAppraiseType.Emoji`,则list长度为5,不足5个时请在对应位置补空字符串。若 `type=BrnAppraiseType.Star`,list长度不能比传入的 BrnAppraiseConfig中的 count 小。 || 默认值为国际化配置的数组,['不好', '还行', '满意', '很棒', '超惊喜'] |
| tags | `List<String>?` | 供选择的标签数据 |||
| inputHintText | String | 输入框的提示文字 || '' |
| onConfirm | `void Function(int index, List<String> selectedTags, String input)?` | 点击提交时的回调,其中index是选中的表情或者五角星的index,selectedTags是选中的标签,input是输入框的内容 |||
Expand Down
Loading

0 comments on commit ac3bd85

Please sign in to comment.