Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix ungroupedsection being shown (#3953)

Browse Source 
* chore: fix ungroupedsection being shown

* chore: board ui adjustment
This commit is contained in:
Richard Shiue 2023-11-17 09:27:10 +08:00 committed by GitHub
parent 31e9a0b4ea
commit 729b8571b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart
View File

@ -278,7 +278,8 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
.where( .where(
(group) => (group) =>
fieldController.getField(group.fieldId) != null && fieldController.getField(group.fieldId) != null &&
(group.isVisible || (group.isDefault && !hideUngrouped)), ((!group.isDefault && group.isVisible) ||
(group.isDefault && !hideUngrouped)),
) )
.map((group) => _initializeGroupData(group)) .map((group) => _initializeGroupData(group))
.toList(), .toList(),

7
frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/widgets/board_hidden_groups.dart
View File

@ -53,7 +53,7 @@ class HiddenGroupsColumn extends StatelessWidget {
), ),
) )
: SizedBox( : SizedBox(
width: 260, width: 234,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -62,7 +62,7 @@ class HiddenGroupsColumn extends StatelessWidget {
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 40 + margin.left, left: 40 + margin.left,
right: margin.right, right: margin.right + 4,
), ),
child: Row( child: Row(
children: [ children: [
@ -99,6 +99,7 @@ class HiddenGroupsColumn extends StatelessWidget {
message: isCollapsed message: isCollapsed
? LocaleKeys.board_hiddenGroupSection_expandTooltip.tr() ? LocaleKeys.board_hiddenGroupSection_expandTooltip.tr()
: LocaleKeys.board_hiddenGroupSection_collapseTooltip.tr(), : LocaleKeys.board_hiddenGroupSection_collapseTooltip.tr(),
preferBelow: false,
child: FlowyIconButton( child: FlowyIconButton(
width: 20, width: 20,
height: 20, height: 20,
@ -252,7 +253,7 @@ class HiddenGroupButtonContent extends StatelessWidget {
} }
return SizedBox( return SizedBox(
height: 30, height: 32,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 4, horizontal: 4,