Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

chore(flutter_desktop): set VisualDensity.standard for entire desktop app (#6648)

Richard Shiuedd0dcace8710
diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
index 9a3af8ff15..e8c980d6f0 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
@@ -32,7 +32,6 @@ void main() {
await tester.editor.showSlashMenu();
await tester.editor.tapSlashMenuItemWithName(
LocaleKeys.document_slashMenu_name_dateOrReminder.tr(),
- offset: 100,
);
final dateTimeSettings = DateTimeSettingsPB(
@@ -85,7 +84,6 @@ void main() {
await tester.editor.showSlashMenu();
await tester.editor.tapSlashMenuItemWithName(
LocaleKeys.document_slashMenu_name_dateOrReminder.tr(),
- offset: 100,
);
final dateTimeSettings = DateTimeSettingsPB(
diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_outline_block_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_outline_block_test.dart
index 02281baebb..3053bd748a 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_outline_block_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_outline_block_test.dart
@@ -169,7 +169,6 @@ Future<void> insertOutlineInDocument(WidgetTester tester) async {
await tester.editor.showSlashMenu();
await tester.editor.tapSlashMenuItemWithName(
LocaleKeys.document_slashMenu_name_outline.tr(),
- offset: 100,
);
await tester.pumpAndSettle();
}
diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_toggle_heading_block_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_toggle_heading_block_test.dart
index ae6f020973..dbbda93453 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_toggle_heading_block_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_toggle_heading_block_test.dart
@@ -76,7 +76,7 @@ Future<void> _insertToggleHeadingBlockInDocument(
await tester.editor.showSlashMenu();
await tester.editor.tapSlashMenuItemWithName(
name,
- offset: 100,
+ offset: 150,
);
await tester.pumpAndSettle();
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
index 83f9e4d868..ff7e33ebdf 100644
--- a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
@@ -596,7 +596,10 @@ extension AppFlowyDatabaseTest on WidgetTester {
final banner = find.byType(RowBanner);
expect(banner, findsOneWidget);
- await startGesture(getCenter(banner), kind: PointerDeviceKind.mouse);
+ await startGesture(
+ getCenter(banner) + const Offset(0, -10),
+ kind: PointerDeviceKind.mouse,
+ );
await pumpAndSettle();
}
@@ -608,7 +611,6 @@ extension AppFlowyDatabaseTest on WidgetTester {
await tapButtonWithName(
LocaleKeys.document_plugins_cover_addCover.tr(),
);
- await pumpAndSettle();
}
Future<void> openEmojiPicker() async =>
diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart
index d6b0f9638a..6d86a57d90 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart
@@ -437,7 +437,6 @@ class _UnscheduledEventsButtonState extends State<UnscheduledEventsButton> {
),
side: BorderSide(color: Theme.of(context).dividerColor),
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- visualDensity: VisualDensity.compact,
),
onPressed: () {
if (state.unscheduleEvents.isNotEmpty) {
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart
index e8e857330b..dfeb665cb7 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart
@@ -40,7 +40,6 @@ class _FilterButtonState extends State<FilterButton> {
LocaleKeys.grid_settings_filter.tr(),
fontColor: textColor,
fontSize: FontSizes.s12,
- fontWeight: FontWeight.w400,
fillColor: Colors.transparent,
hoverColor: AFThemeExtension.of(context).lightGreyHover,
padding: GridSize.toolbarSettingButtonInsets,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart
index 6764d05df9..a333d26410 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart
@@ -37,7 +37,6 @@ class _SortButtonState extends State<SortButton> {
LocaleKeys.grid_settings_sort.tr(),
fontColor: textColor,
fontSize: FontSizes.s12,
- fontWeight: FontWeight.w400,
fillColor: Colors.transparent,
hoverColor: AFThemeExtension.of(context).lightGreyHover,
padding: GridSize.toolbarSettingButtonInsets,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart
index 36a7f09410..23b97e0f66 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart
@@ -47,16 +47,15 @@ class TabBarHeader extends StatelessWidget {
const Expanded(
child: DatabaseTabBar(),
),
- BlocBuilder<DatabaseTabBarBloc, DatabaseTabBarState>(
- builder: (context, state) {
- return SizedBox(
- width: 200,
- child: Padding(
+ Flexible(
+ child: BlocBuilder<DatabaseTabBarBloc, DatabaseTabBarState>(
+ builder: (context, state) {
+ return Padding(
padding: const EdgeInsets.only(top: 6.0),
child: pageSettingBarFromState(context, state),
- ),
- );
- },
+ );
+ },
+ ),
),
],
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart
index 5c8fae8b1c..1110987b95 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart
@@ -38,7 +38,6 @@ class DesktopGridTextCellSkin extends IEditableTextCellSkin {
: null,
),
decoration: const InputDecoration(
- contentPadding: EdgeInsets.only(top: 4),
border: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart
index 435a6f8740..53ef463d4f 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart
@@ -34,7 +34,6 @@ class _SettingButtonState extends State<SettingButton> {
LocaleKeys.settings_title.tr(),
fontColor: Theme.of(context).hintColor,
fontSize: FontSizes.s12,
- fontWeight: FontWeight.w400,
fillColor: Colors.transparent,
hoverColor: AFThemeExtension.of(context).lightGreyHover,
padding: GridSize.toolbarSettingButtonInsets,
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/desktop_appearance.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/desktop_appearance.dart
index c6cf43bd16..904cc07efb 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/desktop_appearance.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/desktop_appearance.dart
@@ -48,6 +48,7 @@ class DesktopAppearance extends BaseAppearance {
// Due to Desktop version has multiple themes, it relies on the current theme to build the ThemeData
return ThemeData(
+ visualDensity: VisualDensity.standard,
useMaterial3: false,
brightness: brightness,
dialogBackgroundColor: theme.surface,
@@ -55,6 +56,11 @@ class DesktopAppearance extends BaseAppearance {
fontFamily: fontFamily,
fontColor: theme.text,
),
+ textButtonTheme: const TextButtonThemeData(
+ style: ButtonStyle(
+ minimumSize: WidgetStatePropertyAll(Size.zero),
+ ),
+ ),
textSelectionTheme: TextSelectionThemeData(
cursorColor: theme.main2,
selectionHandleColor: theme.main2,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart
index 18cacd6c4b..56d2c8d2cc 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_dropdown.dart
@@ -69,7 +69,6 @@ class _SettingsDropdownState<T> extends State<SettingsDropdown<T>> {
EdgeInsets.symmetric(horizontal: 6, vertical: 8),
),
alignment: Alignment.bottomLeft,
- visualDensity: VisualDensity.compact,
),
inputDecorationTheme: InputDecorationTheme(
contentPadding: const EdgeInsets.symmetric(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
index fbb1cf5801..a97cbd31eb 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
@@ -36,9 +36,9 @@ class SettingsMenu extends StatelessWidget {
const EdgeInsets.only(left: 8, right: 4),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surfaceContainerHighest,
- borderRadius: const BorderRadius.only(
- topLeft: Radius.circular(8),
- bottomLeft: Radius.circular(8),
+ borderRadius: const BorderRadiusDirectional.only(
+ topStart: Radius.circular(8),
+ bottomStart: Radius.circular(8),
),
),
child: SingleChildScrollView(
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
index bc86961858..1a29a9379e 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
@@ -528,7 +528,6 @@ class FlowyRichTextButton extends StatelessWidget {
);
child = RawMaterialButton(
- visualDensity: VisualDensity.compact,
hoverElevation: 0,
highlightElevation: 0,
shape: RoundedRectangleBorder(borderRadius: radius ?? Corners.s6Border),
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/icon_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/icon_button.dart
index cdf8e36c3a..cb3605fe7e 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/icon_button.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/icon_button.dart
@@ -86,7 +86,6 @@ class FlowyIconButton extends StatelessWidget {
richMessage: richTooltipText,
child: RawMaterialButton(
clipBehavior: Clip.antiAlias,
- visualDensity: VisualDensity.compact,
hoverElevation: 0,
highlightElevation: 0,
shape: