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: various database UI fixes (#4077)

Richard Shiued4cef2e86658
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart
index aa9aeb7e86..55b8dff554 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart
@@ -14,6 +14,7 @@ Future<T?> showMobileBottomSheet<T>(
bool showHeader = false,
bool showCloseButton = false,
String title = '', // only works if showHeader is true
+ Color? backgroundColor,
}) async {
assert(() {
if (showCloseButton || title.isNotEmpty) assert(showHeader);
@@ -26,6 +27,7 @@ Future<T?> showMobileBottomSheet<T>(
enableDrag: isDragEnabled,
useSafeArea: true,
clipBehavior: Clip.antiAlias,
+ backgroundColor: backgroundColor,
shape: shape ??
const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/number_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/number_cell.dart
index ac0f97283f..4dc4915c5a 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/number_cell.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/number_cell.dart
@@ -51,6 +51,10 @@ class _RowDetailNumberCellState
],
child: TextField(
controller: _controller,
+ keyboardType: const TextInputType.numberWithOptions(
+ signed: true,
+ decimal: true,
+ ),
focusNode: focusNode,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 16),
decoration: InputDecoration(
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart
index c0652d23bf..81026beae0 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/generated/flowy_svgs.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/widgets/show_flowy_mobile_bottom_sheet.dart';
import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';
import 'package:appflowy/plugins/database_view/application/database_controller.dart';
import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';
@@ -139,15 +138,16 @@ class _MobileRowDetailPageState extends State<MobileRowDetailPage> {
}
void _showCardActions(BuildContext context) {
- showFlowyMobileBottomSheet(
+ showMobileBottomSheet(
context,
- title: LocaleKeys.board_cardActions.tr(),
- builder: (_) => Row(
+ backgroundColor: Theme.of(context).colorScheme.background,
+ padding: const EdgeInsets.only(top: 4, bottom: 32),
+ builder: (_) => Column(
+ mainAxisSize: MainAxisSize.min,
children: [
- Expanded(
- child: BottomSheetActionWidget(
- svg: FlowySvgs.copy_s,
- text: LocaleKeys.button_duplicate.tr(),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 8.0),
+ child: _CardActionButton(
onTap: () {
final rowId = _bloc.state.currentRowId;
if (rowId == null) {
@@ -162,13 +162,14 @@ class _MobileRowDetailPageState extends State<MobileRowDetailPage> {
gravity: ToastGravity.BOTTOM,
);
},
+ icon: FlowySvgs.copy_s,
+ text: LocaleKeys.button_duplicate.tr(),
),
),
- const HSpace(8),
- Expanded(
- child: BottomSheetActionWidget(
- svg: FlowySvgs.m_delete_m,
- text: LocaleKeys.button_delete.tr(),
+ const Divider(height: 9),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 8.0),
+ child: _CardActionButton(
onTap: () {
final rowId = _bloc.state.currentRowId;
if (rowId == null) {
@@ -183,14 +184,51 @@ class _MobileRowDetailPageState extends State<MobileRowDetailPage> {
gravity: ToastGravity.BOTTOM,
);
},
+ icon: FlowySvgs.m_delete_m,
+ text: LocaleKeys.button_delete.tr(),
+ color: Theme.of(context).colorScheme.error,
),
),
+ const Divider(height: 9),
],
),
);
}
}
+class _CardActionButton extends StatelessWidget {
+ const _CardActionButton({
+ required this.onTap,
+ required this.icon,
+ required this.text,
+ this.color,
+ });
+
+ final VoidCallback onTap;
+ final FlowySvgData icon;
+ final String text;
+ final Color? color;
+
+ @override
+ Widget build(BuildContext context) {
+ return InkWell(
+ onTap: onTap,
+ borderRadius: BorderRadius.circular(12),
+ child: Container(
+ height: 44,
+ padding: const EdgeInsets.symmetric(horizontal: 8),
+ child: Row(
+ children: [
+ FlowySvg(icon, size: const Size.square(20), color: color),
+ const HSpace(8),
+ FlowyText(text, fontSize: 15, color: color),
+ ],
+ ),
+ ),
+ );
+ }
+}
+
class RowDetailFab extends StatelessWidget {
const RowDetailFab({
super.key,
@@ -352,10 +390,10 @@ class MobileRowDetailPageContentState
placeholder: LocaleKeys.grid_row_titlePlaceholder.tr(),
textStyle:
Theme.of(context).textTheme.bodyMedium?.copyWith(
- fontSize: 22,
+ fontSize: 23,
fontWeight: FontWeight.w500,
),
- cellPadding: const EdgeInsets.symmetric(vertical: 8),
+ cellPadding: const EdgeInsets.symmetric(vertical: 9),
useRoundedBorder: false,
);
@@ -366,7 +404,7 @@ class MobileRowDetailPageContentState
);
return Padding(
- padding: const EdgeInsets.symmetric(horizontal: 18),
+ padding: const EdgeInsets.symmetric(horizontal: 16),
child: cellBuilder.build(
cellContext,
style: cellStyle,
@@ -379,10 +417,10 @@ class MobileRowDetailPageContentState
),
Expanded(
child: ListView(
- padding: const EdgeInsets.only(top: 8, bottom: 100),
+ padding: const EdgeInsets.only(top: 9, bottom: 100),
children: [
Padding(
- padding: const EdgeInsets.symmetric(horizontal: 18),
+ padding: const EdgeInsets.symmetric(horizontal: 16),
child: MobileRowPropertyList(
cellBuilder: cellBuilder,
viewId: viewId,
@@ -390,7 +428,7 @@ class MobileRowDetailPageContentState
),
),
Padding(
- padding: const EdgeInsets.all(12),
+ padding: const EdgeInsets.fromLTRB(6, 6, 16, 0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checkbox_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checkbox_cell.dart
index bfb28d23d7..11ade76eee 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checkbox_cell.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checkbox_cell.dart
@@ -38,11 +38,15 @@ class _CheckboxCellState extends GridCellState<MobileCheckboxCell> {
builder: (context, state) {
return Align(
alignment: Alignment.centerLeft,
- // TODO(yijing): improve icon here
- child: FlowySvg(
- state.isSelected ? FlowySvgs.checkbox_s : FlowySvgs.uncheck_s,
- color: Theme.of(context).colorScheme.onBackground,
- size: const Size.square(24),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+ child: FlowySvg(
+ state.isSelected
+ ? FlowySvgs.check_filled_s
+ : FlowySvgs.uncheck_s,
+ blendMode: BlendMode.dst,
+ size: const Size.square(24),
+ ),
),
);
},
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_number_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_number_cell.dart
index 16fb1b2641..aec6260b10 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_number_cell.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_number_cell.dart
@@ -50,11 +50,13 @@ class _NumberCellState extends GridEditableTextCell<MobileNumberCell> {
child: TextField(
controller: _controller,
focusNode: focusNode,
+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 15),
decoration: InputDecoration(
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
hintText: widget.hintText,
- contentPadding: EdgeInsets.zero,
+ contentPadding:
+ const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
isCollapsed: true,
),
// close keyboard when tapping outside of the text field
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_text_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_text_cell.dart
index 046d94d39a..113f699637 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_text_cell.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_text_cell.dart
@@ -56,12 +56,13 @@ class _MobileTextCellState extends GridEditableTextCell<MobileTextCell> {
child: TextField(
controller: _controller,
focusNode: focusNode,
- style: widget.cellStyle.textStyle,
+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 15),
decoration: InputDecoration(
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
hintText: widget.cellStyle.placeholder,
- contentPadding: EdgeInsets.zero,
+ contentPadding:
+ const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
isCollapsed: true,
),
onTapOutside: (event) =>
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_timestamp_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_timestamp_cell.dart
index 02d169b186..14e3ee326c 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_timestamp_cell.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_timestamp_cell.dart
@@ -1,6 +1,7 @@
import 'package:appflowy/plugins/database_view/application/cell/cell_controller_builder.dart';
import 'package:appflowy/plugins/database_view/widgets/row/cell_builder.dart';
import 'package:appflowy/plugins/database_view/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';
+import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -36,7 +37,13 @@ class _TimestampCellState extends GridCellState<MobileTimestampCell> {
builder: (context, state) {
return Align(
alignment: Alignment.centerLeft,
- child: Text(state.dateStr),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+ child: FlowyText(
+ state.dateStr,
+ fontSize: 15,
+ ),
+ ),
);
},
),
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_url_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_url_cell.dart
index 2299d6003a..e85c49686d 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_url_cell.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_url_cell.dart
@@ -59,7 +59,8 @@ class _GridURLCellState extends GridCellState<MobileURLCell> {
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
hintText: widget.hintText,
- contentPadding: EdgeInsets.zero,
+ contentPadding:
+ const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
isCollapsed: true,
),
// close keyboard when tapping outside of the text field
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart
index d0f2c42c86..117c2478da 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart
@@ -64,16 +64,13 @@ class GridBloc extends Bloc<GridEvent, GridState> {
},
didReceveFilters: (List<FilterInfo> filters) {
emit(
- state.copyWith(
- reorderable: filters.isEmpty && state.sorts.isEmpty,
- filters: filters,
- ),
+ state.copyWith(filters: filters),
);
},
didReceveSorts: (List<SortInfo> sorts) {
emit(
state.copyWith(
- reorderable: sorts.isEmpty && state.filters.isEmpty,
+ reorderable: sorts.isEmpty,
sorts: sorts,
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/create_filter_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/create_filter_list.dart
index dee400002e..e0b3c1c504 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/create_filter_list.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/create_filter_list.dart
@@ -124,6 +124,7 @@ class _FilterTextFieldDelegate extends SliverPersistentHeaderDelegate {
) {
return Container(
padding: const EdgeInsets.only(bottom: 4),
+ color: Theme.of(context).cardColor,
height: fixHeight,
child: FlowyTextField(
hintText: LocaleKeys.grid_settings_filterBy.tr(),
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/footer/grid_footer.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/footer/grid_footer.dart
index 68cfbbad0e..d9067f32fb 100755
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/footer/grid_footer.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/footer/grid_footer.dart
@@ -16,7 +16,7 @@ class GridAddRowButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return FlowyButton(
- text: FlowyText.medium(
+ text: FlowyText(
LocaleKeys.grid_row_newRow.tr(),
color: Theme.of(context).hintColor,
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart
index 31003215ab..73495af305 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart
@@ -2,6 +2,7 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/database/field/bottom_sheet_create_field.dart';
import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';
+import 'package:appflowy/plugins/database_view/application/field/field_info.dart';
import 'package:appflowy/plugins/database_view/grid/application/grid_bloc.dart';
import 'package:appflowy/plugins/database_view/grid/application/grid_header_bloc.dart';
import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/mobile_field_cell.dart';
@@ -92,7 +93,13 @@ class _GridHeaderState extends State<_GridHeader> {
Widget build(BuildContext context) {
return BlocBuilder<GridHeaderBloc, GridHeaderState>(
builder: (context, state) {
- final cells = state.fields
+ final fields = [...state.fields];
+ FieldInfo? firstField;
+ if (PlatformExtension.isMobile && fields.isNotEmpty) {
+ firstField = fields.removeAt(0);
+ }
+
+ final cells = fields
.map(
(fieldInfo) => PlatformExtension.isDesktop
? GridFieldCell(
@@ -129,7 +136,7 @@ class _GridHeaderState extends State<_GridHeader> {
child: child,
),
draggingWidgetOpacity: 0,
- header: const _CellLeading(),
+ header: _cellLeading(firstField),
needsLongPressDraggable: PlatformExtension.isMobile,
footer: _CellTrailing(viewId: widget.viewId),
onReorder: (int oldIndex, int newIndex) {
@@ -162,16 +169,25 @@ class _GridHeaderState extends State<_GridHeader> {
.add(GridHeaderEvent.moveField(field, oldIndex, newIndex));
}
}
-}
-class _CellLeading extends StatelessWidget {
- const _CellLeading({Key? key}) : super(key: key);
-
- @override
- Widget build(BuildContext context) {
- return SizedBox(
- width: GridSize.leadingHeaderPadding,
- );
+ Widget _cellLeading(FieldInfo? fieldInfo) {
+ if (PlatformExtension.isDesktop) {
+ return SizedBox(width: GridSize.leadingHeaderPadding);
+ } else {
+ return Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ SizedBox(width: GridSize.leadingHeaderPadding),
+ if (fieldInfo != null)
+ MobileFieldButton(
+ key: _getKeyById(fieldInfo.id),
+ viewId: widget.viewId,
+ fieldController: widget.fieldController,
+ fieldInfo: fieldInfo,
+ ),
+ ],
+ );
+ }
}
}
@@ -222,10 +238,11 @@ class _CreateFieldButtonState extends State<CreateFieldButton> {
return FlowyButton(
margin: PlatformExtension.isDesktop
? GridSize.cellContentInsets
- : const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
+ : const EdgeInsets.symmetric(vertical: 14, horizontal: 12),
radius: BorderRadius.zero,
- text: FlowyText.medium(
+ text: FlowyText(
LocaleKeys.grid_field_newProperty.tr(),
+ fontSize: 15,
overflow: TextOverflow.ellipsis,
color: PlatformExtension.isDesktop ? null : Theme.of(context).hintColor,
),
@@ -245,6 +262,7 @@ class _CreateFieldButtonState extends State<CreateFieldButton> {
},
leftIcon: FlowySvg(
FlowySvgs.add_s,
+ size: const Size.square(18),
color: PlatformExtension.isDesktop ? null : Theme.of(context).hintColor,
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/mobile_field_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/mobile_field_cell.dart
index df7aa58f57..9d1c3333d3 100755
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/mobile_field_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/mobile_field_cell.dart
@@ -27,31 +27,22 @@ class MobileFieldButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return Container(
+ return SizedBox(
width: fieldInfo.fieldSettings!.width.toDouble(),
- decoration: BoxDecoration(
- border: Border(
- right: BorderSide(
- color: Theme.of(context).dividerColor,
- width: 1.0,
- ),
- ),
- ),
child: FlowyButton(
- onTap: () {
- showEditFieldScreen(context, viewId, fieldInfo);
- },
+ onTap: () => showEditFieldScreen(context, viewId, fieldInfo),
radius: BorderRadius.zero,
- margin: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
+ margin: const EdgeInsets.symmetric(vertical: 14, horizontal: 12),
+ leftIconSize: const Size.square(18),
leftIcon: FlowySvg(
fieldInfo.fieldType.icon(),
- color: Theme.of(context).hintColor,
+ size: const Size.square(18),
),
- text: FlowyText.medium(
+ text: FlowyText(
fieldInfo.name,
+ fontSize: 15,
maxLines: maxLines,
overflow: TextOverflow.ellipsis,
- color: Theme.of(context).hintColor,
),
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/mobile_row.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/mobile_row.dart
index cb283a6434..5ca37d922b 100755
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/mobile_row.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/mobile_row.dart
@@ -71,14 +71,9 @@ class _MobileGridRowState extends State<MobileGridRow> {
children: [
SizedBox(width: GridSize.leadingHeaderPadding),
Expanded(
- child: InkWell(
- onTap: () => widget.openDetailPage(context),
- child: IgnorePointer(
- child: RowContent(
- builder: _cellBuilder,
- onExpand: () => widget.openDetailPage(context),
- ),
- ),
+ child: RowContent(
+ builder: _cellBuilder,
+ onExpand: () => widget.openDetailPage(context),
),
),
],
@@ -155,9 +150,8 @@ class RowContent extends StatelessWidget {
return MobileCellContainer(
width: cellId.fieldInfo.fieldSettings!.width.toDouble(),
isPrimary: cellId.fieldInfo.field.isPrimary,
- accessoryBuilder: (buildContext) {
- return [];
- },
+ accessoryBuilder: (_) => [],
+ onPrimaryFieldCellTap: onExpand,
child: child,
);
},
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/create_sort_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/create_sort_list.dart
index 97238c6ed8..682509213d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/create_sort_list.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/create_sort_list.dart
@@ -124,6 +124,7 @@ class _SortTextFieldDelegate extends SliverPersistentHeaderDelegate {
) {
return Container(
padding: const EdgeInsets.only(bottom: 4),
+ color: Theme.of(context).cardColor,
height: fixHeight,
child: FlowyTextField(
hintText: LocaleKeys.grid_settings_sortBy.tr(),
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dart b/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dart
index 22817c49a7..3e2113a1a7 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dart
@@ -77,11 +77,7 @@ class _DatabaseTabBarViewState extends State<DatabaseTabBarView> {
BlocListener<DatabaseTabBarBloc, DatabaseTabBarState>(
listenWhen: (p, c) => p.selectedIndex != c.selectedIndex,
listener: (context, state) {
- _pageController?.animateToPage(
- state.selectedIndex,
- duration: const Duration(milliseconds: 300),
- curve: Curves.ease,
- );
+ _pageController?.jumpToPage(state.selectedIndex);
},
),
],
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cell.dart
index 198b0e6ea2..d58d12cc0c 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cell.dart
@@ -154,10 +154,12 @@ class _DateCellState extends GridCellState<GridDateCell> {
);
} else {
return FlowyButton(
+ radius: BorderRadius.zero,
+ hoverColor: Colors.transparent,
text: Container(
alignment: alignment,
padding: padding,
- child: FlowyText.medium(text, color: color),
+ child: FlowyText(text, color: color, fontSize: 15),
),
onTap: () {
showMobileBottomSheet(
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/mobile_cell_container.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/mobile_cell_container.dart
index 1902c1c415..4929b2684d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/mobile_cell_container.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/mobile_cell_container.dart
@@ -13,6 +13,7 @@ class MobileCellContainer extends StatelessWidget {
final AccessoryBuilder? accessoryBuilder;
final double width;
final bool isPrimary;
+ final VoidCallback? onPrimaryFieldCellTap;
const MobileCellContainer({
super.key,
@@ -20,6 +21,7 @@ class MobileCellContainer extends StatelessWidget {
required this.width,
required this.isPrimary,
this.accessoryBuilder,
+ this.onPrimaryFieldCellTap,
});
@override
@@ -48,9 +50,17 @@ class MobileCellContainer extends StatelessWidget {
}
}
+ if (isPrimary) {
+ container = IgnorePointer(child: container);
+ }
+
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
+ if (isPrimary) {
+ onPrimaryFieldCellTap?.call();
+ return;
+ }
if (!isFocus) {
child.requestFocus.notify();
}
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/select_option_cell/select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/select_option_cell/select_option_cell.dart
index 41ce4058fb..bfacddcd07 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/select_option_cell/select_option_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/select_option_cell/select_option_cell.dart
@@ -246,6 +246,8 @@ class _SelectOptionWrapState extends State<SelectOptionWrap> {
);
} else {
return FlowyButton(
+ hoverColor: Colors.transparent,
+ radius: BorderRadius.zero,
text: Padding(
padding: widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,
child: _buildMobileOptions(isInRowDetail: false),
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/url_cell/url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/url_cell/url_cell.dart
index 6058c2ff1a..4d20a6c384 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/url_cell/url_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/url_cell/url_cell.dart
@@ -6,6 +6,7 @@ import 'package:appflowy/plugins/database_view/application/cell/cell_controller_
import 'package:appflowy/workspace/presentation/home/toast.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
+import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -200,10 +201,14 @@ class _CopyURLAccessoryState extends State<_CopyURLAccessory>
@override
Widget build(BuildContext context) {
if (widget.cellDataNotifier.value.isNotEmpty) {
- return _URLAccessoryIconContainer(
- child: FlowySvg(
- FlowySvgs.copy_s,
- color: AFThemeExtension.of(context).textColor,
+ return FlowyTooltip(
+ message: LocaleKeys.tooltip_urlCopyAccessory.tr(),
+ preferBelow: false,
+ child: _URLAccessoryIconContainer(
+ child: FlowySvg(
+ FlowySvgs.copy_s,
+ color: AFThemeExtension.of(context).textColor,
+ ),
),
);
} else {
@@ -242,10 +247,14 @@ class _VisitURLAccessoryState extends State<_VisitURLAccessory>
@override
Widget build(BuildContext context) {
if (widget.cellDataNotifier.value.isNotEmpty) {
- return _URLAccessoryIconContainer(
- child: FlowySvg(
- FlowySvgs.attach_s,
- color: AFThemeExtension.of(context).textColor,
+ return FlowyTooltip(
+ message: LocaleKeys.tooltip_urlLaunchAccessory.tr(),
+ preferBelow: false,
+ child: _URLAccessoryIconContainer(
+ child: FlowySvg(
+ FlowySvgs.attach_s,
+ color: AFThemeExtension.of(context).textColor,
+ ),
),
);
} else {
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
index c25bc209d6..efc2b9fc27 100644
--- a/frontend/resources/translations/en.json
+++ b/frontend/resources/translations/en.json
@@ -177,7 +177,9 @@
"dragRow": "Long press to reorder the row",
"viewDataBase": "View database",
"referencePage": "This {name} is referenced",
- "addBlockBelow": "Add a block below"
+ "addBlockBelow": "Add a block below",
+ "urlLaunchAccessory": "Open in browser",
+ "urlCopyAccessory": "Copy URL"
},
"sideBar": {
"closeSidebar": "Close side bar",