Skip to content

Commit e73f143

Browse files
committed
chore: config switch group field UI
1 parent bb7cddc commit e73f143

File tree

2 files changed

+31
-5
lines changed

2 files changed

+31
-5
lines changed

frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:app_flowy/generated/locale_keys.g.dart';
22
import 'package:app_flowy/plugins/board/application/toolbar/board_setting_bloc.dart';
33
import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';
44
import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';
5+
import 'package:app_flowy/plugins/grid/presentation/widgets/toolbar/grid_group.dart';
56
import 'package:app_flowy/plugins/grid/presentation/widgets/toolbar/grid_property.dart';
67
import 'package:easy_localization/easy_localization.dart';
78
import 'package:flowy_infra/image.dart';
@@ -96,8 +97,8 @@ class BoardSettingList extends StatelessWidget {
9697
.show(context);
9798
break;
9899
case BoardSettingAction.groups:
99-
GridPropertyList(
100-
gridId: settingContext.viewId,
100+
GridGroupList(
101+
viewId: settingContext.viewId,
101102
fieldCache: settingContext.fieldCache)
102103
.show(context);
103104
break;
Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,33 @@
1+
import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';
2+
import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_type_extension.dart';
3+
import 'package:flowy_infra/image.dart';
14
import 'package:flowy_infra/theme.dart';
5+
import 'package:flowy_infra_ui/style_widget/button.dart';
6+
import 'package:flowy_infra_ui/style_widget/text.dart';
7+
import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';
28
import 'package:flutter/material.dart';
39
import 'package:provider/provider.dart';
410

511
class GridGroupList extends StatelessWidget {
6-
const GridGroupList({Key? key}) : super(key: key);
12+
final String viewId;
13+
final GridFieldCache fieldCache;
14+
const GridGroupList({
15+
required this.viewId,
16+
required this.fieldCache,
17+
Key? key,
18+
}) : super(key: key);
719

820
@override
921
Widget build(BuildContext context) {
1022
return Container();
1123
}
24+
25+
void show(BuildContext context) {}
1226
}
1327

1428
class _GridGroupCell extends StatelessWidget {
15-
const _GridGroupCell({Key? key}) : super(key: key);
29+
final FieldPB field;
30+
const _GridGroupCell({required this.field, Key? key}) : super(key: key);
1631

1732
@override
1833
Widget build(BuildContext context) {
@@ -22,6 +37,16 @@ class _GridGroupCell extends StatelessWidget {
2237
// ? svgWidget('home/show', color: theme.iconColor)
2338
// : svgWidget('home/hide', color: theme.iconColor);
2439

25-
return Container();
40+
// Padding(
41+
// padding: const EdgeInsets.only(right: 6),
42+
// child: svgWidget("grid/checkmark"),
43+
// ),
44+
45+
return FlowyButton(
46+
text: FlowyText.medium(field.name, fontSize: 12),
47+
hoverColor: theme.hover,
48+
leftIcon: svgWidget(field.fieldType.iconName(), color: theme.iconColor),
49+
onTap: () {},
50+
);
2651
}
2752
}

0 commit comments

Comments
 (0)