fix: edit column sheet uniform ui (#4774)

This commit is contained in:
Mathias Mogensen 2024-02-28 15:04:16 +01:00 committed by GitHub
parent 2286a1c726
commit 2d6856a23d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 42 deletions

View File

@ -1,6 +1,9 @@
import 'package:flutter/material.dart';
import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart'; import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_quick_action_button.dart';
import 'package:appflowy/plugins/database/board/application/board_bloc.dart'; import 'package:appflowy/plugins/database/board/application/board_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart'; import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart'; import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';
@ -8,7 +11,6 @@ import 'package:appflowy_backend/protobuf/flowy-database2/group.pb.dart';
import 'package:appflowy_board/appflowy_board.dart'; import 'package:appflowy_board/appflowy_board.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@ -107,16 +109,18 @@ class _GroupCardHeaderState extends State<GroupCardHeader> {
splashRadius: 5, splashRadius: 5,
onPressed: () => showMobileBottomSheet( onPressed: () => showMobileBottomSheet(
context, context,
title: LocaleKeys.board_column_groupActions.tr(), showDragHandle: true,
showHeader: true, backgroundColor: Theme.of(context).colorScheme.surface,
showCloseButton: true, builder: (_) => SeparatedColumn(
builder: (_) { crossAxisAlignment: CrossAxisAlignment.stretch,
return Row( separatorBuilder: () => const Divider(
height: 8.5,
thickness: 0.5,
),
children: [ children: [
Expanded( MobileQuickActionButton(
child: BottomSheetActionWidget(
svg: FlowySvgs.edit_s,
text: LocaleKeys.board_column_renameColumn.tr(), text: LocaleKeys.board_column_renameColumn.tr(),
icon: FlowySvgs.edit_s,
onTap: () { onTap: () {
context.read<BoardBloc>().add( context.read<BoardBloc>().add(
BoardEvent.startEditingHeader( BoardEvent.startEditingHeader(
@ -126,12 +130,9 @@ class _GroupCardHeaderState extends State<GroupCardHeader> {
context.pop(); context.pop();
}, },
), ),
), MobileQuickActionButton(
const HSpace(8),
Expanded(
child: BottomSheetActionWidget(
svg: FlowySvgs.hide_s,
text: LocaleKeys.board_column_hideColumn.tr(), text: LocaleKeys.board_column_hideColumn.tr(),
icon: FlowySvgs.hide_s,
onTap: () { onTap: () {
context.read<BoardBloc>().add( context.read<BoardBloc>().add(
BoardEvent.toggleGroupVisibility( BoardEvent.toggleGroupVisibility(
@ -143,10 +144,8 @@ class _GroupCardHeaderState extends State<GroupCardHeader> {
context.pop(); context.pop();
}, },
), ),
),
], ],
); ),
},
), ),
), ),
IconButton( IconButton(

View File

@ -941,7 +941,6 @@
"addToColumnBottomTooltip": "Add a new card at the bottom", "addToColumnBottomTooltip": "Add a new card at the bottom",
"renameColumn": "Rename", "renameColumn": "Rename",
"hideColumn": "Hide", "hideColumn": "Hide",
"groupActions": "Group Actions",
"newGroup": "New Group", "newGroup": "New Group",
"deleteColumn": "Delete", "deleteColumn": "Delete",
"deleteColumnConfirmation": "This will delete this group and all the cards in it.\nAre you sure you want to continue?" "deleteColumnConfirmation": "This will delete this group and all the cards in it.\nAre you sure you want to continue?"