Skip to content

Commit 8c51904

Browse files
author
ChenDoXiu
committed
调整设置页面中的可编辑字段顺序,并优化文件夹组件的图标方向
1 parent a86fdbb commit 8c51904

3 files changed

Lines changed: 25 additions & 20 deletions

File tree

lib/pages/settings/profile/profile.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,8 @@ class SettingsProfile extends HookConsumerWidget {
134134
..sort((a, b) =>
135135
a.label.compareTo(b.label)), // Sort by native name
136136
),
137-
MkSettingEditableTextField(
138-
label: "被关注时的消息",
139-
value: meDetail.user.followedMessage,
140-
originalValue: meDetail.originalUser.followedMessage,
141-
helperText: "可以设置被关注时向对方显示的短消息。\n需要批准才能关注的情况下,消息是在请求被批准后显示。",
142-
saveKey: "followedMessage",
143-
onChanged: (value) {
144-
ref.read(memberInfoStateProvider.notifier).updateUser(
145-
meDetail.user.copyWith(followedMessage: value));
146-
},
147-
),
148137
MkFolder(
149-
title: "更多附加信息",
138+
title: "编辑附加信息",
150139
icon: TablerIcons.list,
151140
child: Builder(builder: (context) {
152141
// 从 List<dynamic> 转换为 List<Field>
@@ -185,6 +174,17 @@ class SettingsProfile extends HookConsumerWidget {
185174
);
186175
}),
187176
),
177+
MkSettingEditableTextField(
178+
label: "被关注时的消息",
179+
value: meDetail.user.followedMessage,
180+
originalValue: meDetail.originalUser.followedMessage,
181+
helperText: "可以设置被关注时向对方显示的短消息。\n需要批准才能关注的情况下,消息是在请求被批准后显示。",
182+
saveKey: "followedMessage",
183+
onChanged: (value) {
184+
ref.read(memberInfoStateProvider.notifier).updateUser(
185+
meDetail.user.copyWith(followedMessage: value));
186+
},
187+
),
188188
],
189189
),
190190
),

lib/widgets/settings/editable_fields_list.dart

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,25 @@ class EditableFieldsList extends HookConsumerWidget {
9999
child: Row(
100100
crossAxisAlignment: CrossAxisAlignment.center, // 垂直居中
101101
children: [
102-
const SizedBox(width: 8), // 添加间距
103102
// 拖拽图标
104103
MouseRegion(
105104
cursor: SystemMouseCursors.move,
106105
child: ReorderableDragStartListener(
107106
index: index,
108-
child: const Icon(
109-
TablerIcons.menu,
110-
size: 18,
107+
child: GestureDetector(
108+
// 使用 GestureDetector 包裹
109+
behavior: HitTestBehavior.opaque, // 使 padding 区域可命中
110+
child: Container(
111+
padding: const EdgeInsets.only(
112+
left: 8, right: 16, top: 8, bottom: 8),
113+
child: const Icon(
114+
TablerIcons.menu,
115+
size: 18,
116+
),
117+
),
111118
),
112119
),
113120
),
114-
const SizedBox(width: 16), // 添加间距
115-
116121
// 输入框部分
117122
Expanded(
118123
child: LayoutBuilder(

lib/widgets/settings/folder.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ class MkFolder extends HookConsumerWidget {
6666
),
6767
Icon(
6868
expanded.value
69-
? TablerIcons.chevron_up
70-
: TablerIcons.chevron_down,
69+
? TablerIcons.chevron_down
70+
: TablerIcons.chevron_up,
7171
size: 18,
7272
color: themes.fgColor,
7373
),

0 commit comments

Comments
 (0)