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

Jump to bottom

🎨 migrate BrnSearchText null safe #36

Merged
merged 1 commit into from
Dec 27, 2021
Merged

🎨 migrate BrnSearchText null safe #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 39 additions & 39 deletions lib/src/components/sugsearch/brn_search_text.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// @dart=2.9


import 'package:bruno/src/constants/brn_asset_constants.dart';
import 'package:bruno/src/constants/brn_strings_constants.dart';
Expand All @@ -19,16 +19,16 @@ typedef BrnOnTextClear = bool Function();
/// 基本IOS风格搜索框, 提供输入回调
class BrnSearchText extends StatefulWidget {
/// 提示语
final String hintText;
final String? hintText;

/// 提示语样式
final TextStyle hintStyle;
final TextStyle? hintStyle;

/// 输入框样式
final TextStyle textStyle;
final TextStyle? textStyle;

/// 用于设置搜索框前端的 Icon
final Widget prefixIcon;
final Widget? prefixIcon;

/// 包裹搜索框的容器背景色
final Color outSideColor;
Expand All @@ -40,7 +40,7 @@ class BrnSearchText extends StatefulWidget {
final int maxLines;

/// 最大输入长度
final int maxLength;
final int? maxLength;

/// 输入框最大高度，默认 60
final double maxHeight;
Expand All @@ -49,44 +49,44 @@ class BrnSearchText extends StatefulWidget {
final EdgeInsets innerPadding;

///普通状态的 border
final BoxBorder normalBorder;
final BoxBorder? normalBorder;

/// 激活状态的 Border， 默认和 border 一致
final BoxBorder activeBorder;
final BoxBorder? activeBorder;

/// 输入框圆角
final BorderRadius borderRadius;

/// 右侧操作 widget
final Widget action;
final Widget? action;

/// 是否自动获取焦点
final bool autoFocus;

/// 用于控制键盘动作
final TextInputAction textInputAction;
final TextEditingController controller;
final FocusNode focusNode;
final TextInputAction? textInputAction;
final TextEditingController? controller;
final FocusNode? focusNode;

/// 文本变化的回调
final BrnOnSearchTextChange onTextChange;
final BrnOnSearchTextChange? onTextChange;

/// 提交文本时的回调
final BrnOnCommit onTextCommit;
final BrnOnCommit? onTextCommit;

/// 右侧 action 区域点击的回调
final VoidCallback onActionTap;
final VoidCallback? onActionTap;

/// 清除按钮的回调 如果用户设置了该属性
/// 如果返回值为true，表明用户想要拦截，则不会走默认的清除行为
/// 如果返回值为false，表明用户不想要拦截，在执行了用户的行为之后，还会走默认的行为
final BrnOnTextClear onTextClear;
final BrnOnTextClear? onTextClear;

/// 用于控制清除 Icon 和右侧 Action 的显示与隐藏。等其他复杂的操作。
final BrnSearchTextController searchController;
final BrnSearchTextController? searchController;

const BrnSearchText({
Key key,
Key? key,
this.searchController,
this.controller,
this.maxLines = 1,
Expand Down Expand Up @@ -120,12 +120,12 @@ class BrnSearchText extends StatefulWidget {
}

class _SearchTextState extends State<BrnSearchText> {
FocusNode focusNode;
TextEditingController textEditingController;
BoxBorder border;
BrnSearchTextController searchTextController;
FocusNode? focusNode;
Copy link
Collaborator

Choose a reason for hiding this comment

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

以下内部使用的属性是否 不用是 ？的

TextEditingController? textEditingController;
BoxBorder? border;
BrnSearchTextController? searchTextController;

BrnSearchTextController tmpController;
BrnSearchTextController? tmpController;

@override
void initState() {
Expand All @@ -135,7 +135,7 @@ class _SearchTextState extends State<BrnSearchText> {
tmpController = BrnSearchTextController();
}
searchTextController = widget.searchController ?? tmpController;
searchTextController.addListener(() {
searchTextController!.addListener(() {
if (mounted) {
setState(() {});
}
Expand All @@ -148,20 +148,20 @@ class _SearchTextState extends State<BrnSearchText> {
color: widget.innerColor,
);

focusNode.addListener(_handleFocusNodeChangeListenerTick);
focusNode!.addListener(_handleFocusNodeChangeListenerTick);
}

@override
void dispose() {
// TODO: implement dispose
super.dispose();
tmpController?.dispose();
focusNode.removeListener(_handleFocusNodeChangeListenerTick);
focusNode!.removeListener(_handleFocusNodeChangeListenerTick);
}

/// 焦点状态回到，用于刷新当前 UI
void _handleFocusNodeChangeListenerTick() {
if (focusNode.hasFocus) {
if (focusNode!.hasFocus) {
border = widget.activeBorder ?? border;
} else {
border = widget.normalBorder ?? border;
Expand Down Expand Up @@ -216,7 +216,7 @@ class _SearchTextState extends State<BrnSearchText> {
// 光标颜色属性，绘制光标时使用的颜色。
cursorColor: BrnThemeConfigurator.instance
.getConfig()
.commonConfig
.commonConfig!
.brandPrimary,
// 光标宽度属性，光标的厚度，默认是2.0。
cursorWidth: 2.0,
Expand All @@ -226,7 +226,7 @@ class _SearchTextState extends State<BrnSearchText> {
textBaseline: TextBaseline.alphabetic,
color: BrnThemeConfigurator.instance
.getConfig()
.commonConfig
.commonConfig!
.colorTextBase,
fontSize: 16),
// 装饰（`decoration`）属性，在文本字段周围显示的装饰。
Expand Down Expand Up @@ -256,34 +256,34 @@ class _SearchTextState extends State<BrnSearchText> {
// 在改变属性，当正在编辑的文本发生更改时调用。
onChanged: (content) {
if (widget.onTextChange != null) {
widget.onTextChange(content);
widget.onTextChange!(content);
}
setState(() {});
},
onSubmitted: (content) {
if (widget.onTextCommit != null) {
widget.onTextCommit(content);
widget.onTextCommit!(content);
}
}),
),
Visibility(
visible: searchTextController.isClearShow,
visible: searchTextController!.isClearShow,
child: GestureDetector(
onTap: () {
if (widget.onTextClear != null) {
bool isIntercept = widget.onTextClear() ?? false;
bool isIntercept = widget.onTextClear!() ?? false;
if (isIntercept) return;
}
textEditingController.clear();
textEditingController!.clear();
if (this.widget.onTextChange != null) {
this
.widget
.onTextChange(textEditingController.value.text);
.onTextChange!(textEditingController!.value.text);
}
setState(() {});
},
child: Visibility(
visible: textEditingController.text.isNotEmpty,
visible: textEditingController!.text.isNotEmpty,
child: Padding(
padding:
const EdgeInsets.symmetric(horizontal: 12.0),
Expand All @@ -299,12 +299,12 @@ class _SearchTextState extends State<BrnSearchText> {
),
),
Visibility(
visible: searchTextController.isActionShow,
visible: searchTextController!.isActionShow,
child: widget.action ??
GestureDetector(
onTap: () {
if (widget.onActionTap != null) {
widget.onActionTap();
widget.onActionTap!();
}
},
child: Container(
Expand All @@ -314,7 +314,7 @@ class _SearchTextState extends State<BrnSearchText> {
style: TextStyle(
color: BrnThemeConfigurator.instance
.getConfig()
.commonConfig
.commonConfig!
.colorTextBase,
fontSize: 16,
height: 1),
Expand Down