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.

feat(mobile): database filters (#6401)

Richard Shiue783d45810084
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_page.dart
index f8f63c79d4..2885f37bbd 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_page.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_page.dart
@@ -7,11 +7,11 @@ import 'package:appflowy/mobile/presentation/database/board/widgets/group_card_h
import 'package:appflowy/mobile/presentation/database/card/card.dart';
import 'package:appflowy/plugins/database/application/database_controller.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/widgets/card/card.dart';
import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';
import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/mobile_board_card_cell_style.dart';
import 'package:appflowy/shared/flowy_error_page.dart';
+import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/group_card_header.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/group_card_header.dart
index 35208c91bd..ebc492de09 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/group_card_header.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/group_card_header.dart
@@ -3,7 +3,7 @@ import 'package:appflowy/generated/locale_keys.g.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/grid/presentation/widgets/header/field_type_extension.dart';
+import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_board/appflowy_board.dart';
import 'package:easy_localization/easy_localization.dart';
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet.dart
new file mode 100644
index 0000000000..8008edb5d9
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet.dart
@@ -0,0 +1,1075 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';
+import 'package:appflowy/mobile/presentation/database/view/database_filter_condition_list.dart';
+import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_search_text_field.dart';
+import 'package:appflowy/mobile/presentation/widgets/flowy_option_tile.dart';
+import 'package:appflowy/plugins/database/application/field/field_info.dart';
+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';
+import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
+import 'package:appflowy/plugins/database/grid/application/filter/select_option_loader.dart';
+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart';
+import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart';
+import 'package:appflowy/util/debounce.dart';
+import 'package:appflowy/util/field_type_extension.dart';
+import 'package:appflowy/workspace/presentation/widgets/date_picker/widgets/mobile_date_editor.dart';
+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
+import 'package:collection/collection.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra/size.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:protobuf/protobuf.dart' hide FieldInfo;
+import 'package:time/time.dart';
+
+import 'database_filter_bottom_sheet_cubit.dart';
+
+class MobileFilterEditor extends StatefulWidget {
+ const MobileFilterEditor({super.key});
+
+ @override
+ State<MobileFilterEditor> createState() => _MobileFilterEditorState();
+}
+
+class _MobileFilterEditorState extends State<MobileFilterEditor> {
+ final PageController _pageController = PageController();
+
+ @override
+ void dispose() {
+ _pageController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocProvider(
+ create: (context) => MobileFilterEditorCubit(
+ pageController: _pageController,
+ ),
+ child: Column(
+ children: [
+ const _Header(),
+ SizedBox(
+ height: 400,
+ child: PageView.builder(
+ controller: _pageController,
+ itemCount: 2,
+ physics: const NeverScrollableScrollPhysics(),
+ itemBuilder: (context, index) {
+ return switch (index) {
+ 0 => const _ActiveFilters(),
+ 1 => const _FilterDetail(),
+ _ => const SizedBox.shrink(),
+ };
+ },
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
+
+class _Header extends StatelessWidget {
+ const _Header();
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<MobileFilterEditorCubit, MobileFilterEditorState>(
+ builder: (context, state) {
+ return SizedBox(
+ height: 44.0,
+ child: Stack(
+ children: [
+ if (_isBackButtonShown(state))
+ Align(
+ alignment: Alignment.centerLeft,
+ child: AppBarBackButton(
+ padding: const EdgeInsets.symmetric(
+ vertical: 12,
+ horizontal: 16,
+ ),
+ onTap: () => context
+ .read<MobileFilterEditorCubit>()
+ .returnToOverview(),
+ ),
+ ),
+ Align(
+ child: FlowyText.medium(
+ LocaleKeys.grid_settings_filter.tr(),
+ fontSize: 16.0,
+ ),
+ ),
+ if (_isSaveButtonShown(state))
+ Align(
+ alignment: Alignment.centerRight,
+ child: AppBarSaveButton(
+ padding: const EdgeInsets.symmetric(
+ vertical: 12,
+ horizontal: 16,
+ ),
+ enable: _isSaveButtonEnabled(state),
+ onTap: () => _saveOnTapHandler(context, state),
+ ),
+ ),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ bool _isBackButtonShown(MobileFilterEditorState state) {
+ return state.maybeWhen(
+ overview: () => false,
+ orElse: () => true,
+ );
+ }
+
+ bool _isSaveButtonShown(MobileFilterEditorState state) {
+ return state.maybeWhen(
+ create: (_) => true,
+ editField: (_, __) => true,
+ editCondition: (filterId, newFilter, showSave) => showSave,
+ editContent: (_, __) => true,
+ orElse: () => false,
+ );
+ }
+
+ bool _isSaveButtonEnabled(MobileFilterEditorState state) {
+ return state.maybeWhen(
+ create: (field) => field != null,
+ editField: (_, __) => true,
+ editCondition: (_, __, enableSave) => enableSave,
+ editContent: (_, __) => true,
+ orElse: () => false,
+ );
+ }
+
+ void _saveOnTapHandler(BuildContext context, MobileFilterEditorState state) {
+ state.maybeWhen(
+ create: (filterField) {
+ if (filterField != null) {
+ context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.createFilter(filterField));
+ }
+ },
+ editField: (filterId, newField) {
+ final filter = context
+ .read<FilterEditorBloc>()
+ .state
+ .filters
+ .firstWhereOrNull((filter) => filter.filterId == filterId);
+ if (newField != null &&
+ filter != null &&
+ newField.id != filter.fieldId) {
+ context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.changeFilteringField(filterId, newField));
+ }
+ },
+ editCondition: (filterId, newFilter, _) {
+ context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.updateFilter(newFilter));
+ },
+ editContent: (filterId, newFilter) {
+ context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.updateFilter(newFilter));
+ },
+ orElse: () {},
+ );
+ context.read<MobileFilterEditorCubit>().returnToOverview();
+ }
+}
+
+class _ActiveFilters extends StatelessWidget {
+ const _ActiveFilters();
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<FilterEditorBloc, FilterEditorState>(
+ builder: (context, state) {
+ return Padding(
+ padding: EdgeInsets.only(
+ bottom: MediaQuery.of(context).padding.bottom,
+ ),
+ child: Column(
+ children: [
+ Expanded(
+ child: state.filters.isEmpty
+ ? _emptyBackground(context)
+ : _filterList(context, state),
+ ),
+ const VSpace(12),
+ const _CreateFilterButton(),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ Widget _emptyBackground(BuildContext context) {
+ return Center(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ FlowySvg(
+ FlowySvgs.filter_s,
+ size: const Size.square(60),
+ color: Theme.of(context).hintColor,
+ ),
+ FlowyText(
+ LocaleKeys.grid_filter_empty.tr(),
+ color: Theme.of(context).hintColor,
+ ),
+ ],
+ ),
+ );
+ }
+
+ Widget _filterList(BuildContext context, FilterEditorState state) {
+ return ListView.separated(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 16,
+ ),
+ itemCount: state.filters.length,
+ itemBuilder: (context, index) {
+ final filter = state.filters[index];
+ final field = context
+ .read<FilterEditorBloc>()
+ .state
+ .fields
+ .firstWhereOrNull((field) => field.id == filter.fieldId);
+ return field == null
+ ? const SizedBox.shrink()
+ : _FilterItem(filter: filter, field: field);
+ },
+ separatorBuilder: (context, index) => const VSpace(12.0),
+ );
+ }
+}
+
+class _CreateFilterButton extends StatelessWidget {
+ const _CreateFilterButton();
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ height: 44,
+ width: double.infinity,
+ margin: const EdgeInsets.symmetric(horizontal: 14),
+ decoration: BoxDecoration(
+ border: Border.fromBorderSide(
+ BorderSide(
+ width: 0.5,
+ color: Theme.of(context).dividerColor,
+ ),
+ ),
+ borderRadius: Corners.s10Border,
+ ),
+ child: InkWell(
+ onTap: () {
+ if (context.read<FilterEditorBloc>().state.fields.isEmpty) {
+ Fluttertoast.showToast(
+ msg: LocaleKeys.grid_filter_cannotFindCreatableField.tr(),
+ gravity: ToastGravity.BOTTOM,
+ );
+ } else {
+ context.read<MobileFilterEditorCubit>().startCreatingFilter();
+ }
+ },
+ borderRadius: Corners.s10Border,
+ child: Center(
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const FlowySvg(
+ FlowySvgs.add_s,
+ size: Size.square(16),
+ ),
+ const HSpace(6.0),
+ FlowyText(
+ LocaleKeys.grid_filter_addFilter.tr(),
+ fontSize: 15,
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
+
+class _FilterItem extends StatelessWidget {
+ const _FilterItem({
+ required this.filter,
+ required this.field,
+ });
+
+ final DatabaseFilter filter;
+ final FieldInfo field;
+
+ @override
+ Widget build(BuildContext context) {
+ return DecoratedBox(
+ decoration: BoxDecoration(
+ color: Theme.of(context).hoverColor,
+ borderRadius: BorderRadius.circular(12),
+ ),
+ child: Stack(
+ children: [
+ Padding(
+ padding: const EdgeInsets.symmetric(
+ vertical: 14,
+ horizontal: 8,
+ ),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 12.0),
+ child: FlowyText.medium(
+ LocaleKeys.grid_filter_where.tr(),
+ fontSize: 15,
+ ),
+ ),
+ const VSpace(10),
+ Row(
+ children: [
+ Expanded(
+ child: FilterItemInnerButton(
+ onTap: () => context
+ .read<MobileFilterEditorCubit>()
+ .startEditingFilterField(filter.filterId),
+ icon: field.fieldType.svgData,
+ child: FlowyText(
+ field.name,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ ),
+ const HSpace(6),
+ Expanded(
+ child: FilterItemInnerButton(
+ onTap: () => context
+ .read<MobileFilterEditorCubit>()
+ .startEditingFilterCondition(
+ filter.filterId,
+ filter,
+ filter.fieldType.isDate,
+ ),
+ child: FlowyText(
+ filter.conditionName,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ ),
+ ],
+ ),
+ if (filter.canAttachContent) ...[
+ const VSpace(6),
+ filter.getMobileDescription(
+ field,
+ onExpand: () => context
+ .read<MobileFilterEditorCubit>()
+ .startEditingFilterContent(filter.filterId, filter),
+ onUpdate: (newFilter) => context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.updateFilter(newFilter)),
+ ),
+ ],
+ ],
+ ),
+ ),
+ Positioned(
+ right: 8,
+ top: 6,
+ child: _deleteButton(context),
+ ),
+ ],
+ ),
+ );
+ }
+
+ Widget _deleteButton(BuildContext context) {
+ return InkWell(
+ onTap: () => context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.deleteFilter(filter.filterId)),
+ // steal from the container LongClickReorderWidget thing
+ onLongPress: () {},
+ borderRadius: BorderRadius.circular(10),
+ child: SizedBox.square(
+ dimension: 34,
+ child: Center(
+ child: FlowySvg(
+ FlowySvgs.trash_m,
+ size: const Size.square(18),
+ color: Theme.of(context).hintColor,
+ ),
+ ),
+ ),
+ );
+ }
+}
+
+class FilterItemInnerButton extends StatelessWidget {
+ const FilterItemInnerButton({
+ super.key,
+ required this.onTap,
+ required this.child,
+ this.icon,
+ });
+
+ final VoidCallback onTap;
+ final FlowySvgData? icon;
+ final Widget child;
+
+ @override
+ Widget build(BuildContext context) {
+ return GestureDetector(
+ behavior: HitTestBehavior.opaque,
+ onTap: onTap,
+ child: Container(
+ height: 44,
+ decoration: BoxDecoration(
+ border: Border.fromBorderSide(
+ BorderSide(
+ width: 0.5,
+ color: Theme.of(context).dividerColor,
+ ),
+ ),
+ borderRadius: Corners.s10Border,
+ color: Theme.of(context).colorScheme.surface,
+ ),
+ padding: const EdgeInsets.symmetric(horizontal: 12),
+ child: Center(
+ child: SeparatedRow(
+ separatorBuilder: () => const HSpace(6.0),
+ children: [
+ if (icon != null)
+ FlowySvg(
+ icon!,
+ size: const Size.square(16),
+ ),
+ Expanded(child: child),
+ FlowySvg(
+ FlowySvgs.icon_right_small_ccm_outlined_s,
+ size: const Size.square(14),
+ color: Theme.of(context).hintColor,
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
+
+class FilterItemInnerTextField extends StatefulWidget {
+ const FilterItemInnerTextField({
+ super.key,
+ required this.content,
+ required this.enabled,
+ required this.onSubmitted,
+ });
+
+ final String content;
+ final bool enabled;
+ final void Function(String) onSubmitted;
+
+ @override
+ State<FilterItemInnerTextField> createState() =>
+ _FilterItemInnerTextFieldState();
+}
+
+class _FilterItemInnerTextFieldState extends State<FilterItemInnerTextField> {
+ late final TextEditingController textController =
+ TextEditingController(text: widget.content);
+ final FocusNode focusNode = FocusNode();
+ final Debounce debounce = Debounce(duration: 300.milliseconds);
+
+ @override
+ void dispose() {
+ focusNode.dispose();
+ textController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return SizedBox(
+ height: 44,
+ child: TextField(
+ enabled: widget.enabled,
+ focusNode: focusNode,
+ controller: textController,
+ onSubmitted: widget.onSubmitted,
+ onChanged: (value) => debounce.call(() => widget.onSubmitted(value)),
+ onTapOutside: (_) => focusNode.unfocus(),
+ decoration: InputDecoration(
+ filled: true,
+ fillColor: widget.enabled
+ ? Theme.of(context).colorScheme.surface
+ : Theme.of(context).disabledColor,
+ enabledBorder: _getBorder(Theme.of(context).dividerColor),
+ border: _getBorder(Theme.of(context).dividerColor),
+ focusedBorder: _getBorder(Theme.of(context).colorScheme.primary),
+ contentPadding: const EdgeInsets.symmetric(horizontal: 12),
+ ),
+ ),
+ );
+ }
+
+ InputBorder _getBorder(Color color) {
+ return OutlineInputBorder(
+ borderSide: BorderSide(
+ width: 0.5,
+ color: color,
+ ),
+ borderRadius: Corners.s10Border,
+ );
+ }
+}
+
+class _FilterDetail extends StatelessWidget {
+ const _FilterDetail();
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<MobileFilterEditorCubit, MobileFilterEditorState>(
+ builder: (context, state) {
+ return state.maybeWhen(
+ create: (filterField) {
+ return _FilterableFieldList(
+ onSelectField: (field) =>
+ context.read<MobileFilterEditorCubit>().changeField(field),
+ );
+ },
+ editField: (filterId, newField) {
+ return _FilterableFieldList(
+ onSelectField: (field) {
+ context.read<MobileFilterEditorCubit>().changeField(field);
+ },
+ );
+ },
+ editCondition: (filterId, newFilter, showSave) {
+ return _FilterConditionList(
+ filterId: filterId,
+ onSelect: (newFilter) {
+ context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.updateFilter(newFilter));
+ context.read<MobileFilterEditorCubit>().returnToOverview();
+ },
+ );
+ },
+ editContent: (filterId, filter) {
+ return _FilterContentEditor(
+ filter: filter,
+ onUpdateFilter: (newFilter) {
+ context.read<MobileFilterEditorCubit>().updateFilter(newFilter);
+ },
+ );
+ },
+ orElse: () => const SizedBox.shrink(),
+ );
+ },
+ );
+ }
+}
+
+class _FilterableFieldList extends StatelessWidget {
+ const _FilterableFieldList({
+ required this.onSelectField,
+ });
+
+ final void Function(FieldInfo field) onSelectField;
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const VSpace(4.0),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: FlowyText(
+ LocaleKeys.grid_settings_filterBy.tr().toUpperCase(),
+ fontSize: 13,
+ color: Theme.of(context).hintColor,
+ ),
+ ),
+ const VSpace(4.0),
+ const Divider(
+ height: 0.5,
+ thickness: 0.5,
+ ),
+ Expanded(
+ child: BlocBuilder<FilterEditorBloc, FilterEditorState>(
+ builder: (context, blocState) {
+ return ListView.builder(
+ itemCount: blocState.fields.length,
+ itemBuilder: (context, index) {
+ return FlowyOptionTile.checkbox(
+ text: blocState.fields[index].name,
+ showTopBorder: false,
+ leftIcon: FlowySvg(
+ blocState.fields[index].fieldType.svgData,
+ ),
+ isSelected: _isSelected(context, blocState, index),
+ onTap: () => onSelectField(blocState.fields[index]),
+ );
+ },
+ );
+ },
+ ),
+ ),
+ ],
+ );
+ }
+
+ bool _isSelected(BuildContext context, FilterEditorState state, int index) {
+ final field = state.fields[index];
+ return context.watch<MobileFilterEditorCubit>().state.maybeWhen(
+ create: (selectedField) {
+ return selectedField != null && selectedField.id == field.id;
+ },
+ editField: (filterId, selectedField) {
+ final filter = state.filters.firstWhereOrNull(
+ (filter) => filter.filterId == filterId,
+ );
+
+ final isOriginalSelectedField =
+ selectedField == null && filter?.fieldId == field.id;
+
+ final isNewSelectedField =
+ selectedField != null && selectedField.id == field.id;
+
+ return isOriginalSelectedField || isNewSelectedField;
+ },
+ orElse: () => false,
+ );
+ }
+}
+
+class _FilterConditionList extends StatelessWidget {
+ const _FilterConditionList({
+ required this.filterId,
+ required this.onSelect,
+ });
+
+ final String filterId;
+ final void Function(DatabaseFilter filter) onSelect;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocSelector<FilterEditorBloc, FilterEditorState, DatabaseFilter?>(
+ selector: (state) => state.filters.firstWhereOrNull(
+ (filter) => filter.filterId == filterId,
+ ),
+ builder: (context, filter) {
+ if (filter == null) {
+ return const SizedBox.shrink();
+ }
+
+ if (filter is DateTimeFilter?) {
+ return _DateTimeFilterConditionList(
+ onSelect: (filter) {
+ context.read<MobileFilterEditorCubit>().updateFilter(filter);
+ },
+ );
+ }
+
+ final conditions =
+ FilterCondition.fromFieldType(filter.fieldType).conditions;
+
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const VSpace(4.0),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: FlowyText(
+ LocaleKeys.grid_filter_conditon.tr().toUpperCase(),
+ fontSize: 13,
+ color: Theme.of(context).hintColor,
+ ),
+ ),
+ const VSpace(4.0),
+ const Divider(
+ height: 0.5,
+ thickness: 0.5,
+ ),
+ Expanded(
+ child: ListView.builder(
+ itemCount: conditions.length,
+ itemBuilder: (context, index) {
+ return FlowyOptionTile.checkbox(
+ text: conditions[index].$2,
+ showTopBorder: false,
+ isSelected: _isSelected(filter, conditions[index].$1),
+ onTap: () {
+ final newFilter =
+ _updateCondition(filter, conditions[index].$1);
+ onSelect(newFilter);
+ },
+ );
+ },
+ ),
+ ),
+ ],
+ );
+ },
+ );
+ }
+
+ bool _isSelected(DatabaseFilter filter, ProtobufEnum condition) {
+ return switch (filter.fieldType) {
+ FieldType.RichText ||
+ FieldType.URL =>
+ (filter as TextFilter).condition == condition,
+ FieldType.Number => (filter as NumberFilter).condition == condition,
+ FieldType.SingleSelect ||
+ FieldType.MultiSelect =>
+ (filter as SelectOptionFilter).condition == condition,
+ FieldType.Checkbox => (filter as CheckboxFilter).condition == condition,
+ FieldType.Checklist => (filter as ChecklistFilter).condition == condition,
+ _ => false,
+ };
+ }
+
+ DatabaseFilter _updateCondition(
+ DatabaseFilter filter,
+ ProtobufEnum condition,
+ ) {
+ return switch (filter.fieldType) {
+ FieldType.RichText || FieldType.URL => (filter as TextFilter)
+ .copyWith(condition: condition as TextFilterConditionPB),
+ FieldType.Number => (filter as NumberFilter)
+ .copyWith(condition: condition as NumberFilterConditionPB),
+ FieldType.SingleSelect ||
+ FieldType.MultiSelect =>
+ (filter as SelectOptionFilter)
+ .copyWith(condition: condition as SelectOptionFilterConditionPB),
+ FieldType.Checkbox => (filter as CheckboxFilter)
+ .copyWith(condition: condition as CheckboxFilterConditionPB),
+ FieldType.Checklist => (filter as ChecklistFilter)
+ .copyWith(condition: condition as ChecklistFilterConditionPB),
+ _ => filter,
+ };
+ }
+}
+
+class _DateTimeFilterConditionList extends StatelessWidget {
+ const _DateTimeFilterConditionList({
+ required this.onSelect,
+ });
+
+ final void Function(DatabaseFilter) onSelect;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<MobileFilterEditorCubit, MobileFilterEditorState>(
+ builder: (context, state) {
+ return state.maybeWhen(
+ orElse: () => const SizedBox.shrink(),
+ editCondition: (filterId, newFilter, _) {
+ final filter = newFilter as DateTimeFilter;
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const VSpace(4.0),
+ if (filter.fieldType == FieldType.DateTime)
+ _DateTimeFilterIsStartSelector(
+ isStart: filter.condition.isStart,
+ onSelect: (newValue) {
+ final newFilter = filter.copyWithCondition(
+ isStart: newValue,
+ condition: filter.condition.toCondition(),
+ );
+ onSelect(newFilter);
+ },
+ ),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: FlowyText(
+ LocaleKeys.grid_filter_conditon.tr().toUpperCase(),
+ fontSize: 13,
+ color: Theme.of(context).hintColor,
+ ),
+ ),
+ const VSpace(4.0),
+ const Divider(
+ height: 0.5,
+ thickness: 0.5,
+ ),
+ Expanded(
+ child: ListView.builder(
+ itemCount: DateTimeFilterCondition.values.length,
+ itemBuilder: (context, index) {
+ final condition = DateTimeFilterCondition.values[index];
+ return FlowyOptionTile.checkbox(
+ text: condition.filterName,
+ showTopBorder: false,
+ isSelected: filter.condition.toCondition() == condition,
+ onTap: () {
+ final newFilter = filter.copyWithCondition(
+ isStart: filter.condition.isStart,
+ condition: condition,
+ );
+ onSelect(newFilter);
+ },
+ );
+ },
+ ),
+ ),
+ ],
+ );
+ },
+ );
+ },
+ );
+ }
+}
+
+class _DateTimeFilterIsStartSelector extends StatelessWidget {
+ const _DateTimeFilterIsStartSelector({
+ required this.isStart,
+ required this.onSelect,
+ });
+
+ final bool isStart;
+ final void Function(bool isStart) onSelect;
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: const EdgeInsets.fromLTRB(16, 0, 16, 20),
+ child: DefaultTabController(
+ length: 2,
+ initialIndex: isStart ? 0 : 1,
+ child: Container(
+ padding: const EdgeInsets.all(3.0),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(10),
+ color: Theme.of(context).hoverColor,
+ ),
+ child: TabBar(
+ indicatorSize: TabBarIndicatorSize.label,
+ labelPadding: EdgeInsets.zero,
+ padding: EdgeInsets.zero,
+ indicatorWeight: 0,
+ indicator: BoxDecoration(
+ borderRadius: BorderRadius.circular(10),
+ color: Theme.of(context).colorScheme.surface,
+ ),
+ splashFactory: NoSplash.splashFactory,
+ overlayColor: const WidgetStatePropertyAll(
+ Colors.transparent,
+ ),
+ onTap: (index) => onSelect(index == 0),
+ tabs: [
+ _tab(LocaleKeys.grid_dateFilter_startDate.tr()),
+ _tab(LocaleKeys.grid_dateFilter_endDate.tr()),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ Tab _tab(String name) {
+ return Tab(
+ height: 34,
+ child: Center(
+ child: FlowyText(
+ name,
+ fontSize: 14,
+ ),
+ ),
+ );
+ }
+}
+
+class _FilterContentEditor extends StatelessWidget {
+ const _FilterContentEditor({
+ required this.filter,
+ required this.onUpdateFilter,
+ });
+
+ final DatabaseFilter filter;
+ final void Function(DatabaseFilter) onUpdateFilter;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<FilterEditorBloc, FilterEditorState>(
+ builder: (context, state) {
+ final field = state.fields
+ .firstWhereOrNull((field) => field.id == filter.fieldId);
+ if (field == null) return const SizedBox.shrink();
+ return switch (field.fieldType) {
+ FieldType.SingleSelect ||
+ FieldType.MultiSelect =>
+ _SelectOptionFilterContentEditor(
+ filter: filter as SelectOptionFilter,
+ field: field,
+ ),
+ FieldType.DateTime =>
+ _DateTimeFilterContentEditor(filter: filter as DateTimeFilter),
+ _ => const SizedBox.shrink(),
+ };
+ },
+ );
+ }
+}
+
+class _SelectOptionFilterContentEditor extends StatefulWidget {
+ _SelectOptionFilterContentEditor({
+ required this.filter,
+ required this.field,
+ }) : delegate = filter.makeDelegate(field);
+
+ final SelectOptionFilter filter;
+ final FieldInfo field;
+ final SelectOptionFilterDelegate delegate;
+
+ @override
+ State<_SelectOptionFilterContentEditor> createState() =>
+ _SelectOptionFilterContentEditorState();
+}
+
+class _SelectOptionFilterContentEditorState
+ extends State<_SelectOptionFilterContentEditor> {
+ final TextEditingController textController = TextEditingController();
+
+ @override
+ void dispose() {
+ textController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final options = widget.delegate.getOptions(widget.field);
+ return Column(
+ children: [
+ const Divider(
+ height: 0.5,
+ thickness: 0.5,
+ ),
+ Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: FlowyMobileSearchTextField(
+ controller: textController,
+ onChanged: (asdf) {},
+ onSubmitted: (asdf) {},
+ hintText: LocaleKeys.grid_selectOption_searchOption.tr(),
+ ),
+ ),
+ Expanded(
+ child: ListView.separated(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ separatorBuilder: (context, index) => const VSpace(20),
+ itemCount: options.length,
+ itemBuilder: (context, index) {
+ return MobileSelectOption(
+ option: options[index],
+ isSelected: widget.filter.optionIds.contains(options[index].id),
+ onTap: (isSelected) {
+ _onTapHandler(
+ context,
+ options,
+ options[index],
+ isSelected,
+ );
+ },
+ indicator: _getIndicator(),
+ showMoreOptionsButton: false,
+ );
+ },
+ ),
+ ),
+ ],
+ );
+ }
+
+ MobileSelectedOptionIndicator _getIndicator() {
+ return widget.filter.condition == SelectOptionFilterConditionPB.OptionIs &&
+ widget.field.fieldType == FieldType.SingleSelect
+ ? MobileSelectedOptionIndicator.single
+ : MobileSelectedOptionIndicator.multi;
+ }
+
+ void _onTapHandler(
+ BuildContext context,
+ List<SelectOptionPB> options,
+ SelectOptionPB option,
+ bool isSelected,
+ ) {
+ if (isSelected) {
+ final selectedOptionIds = Set<String>.from(widget.filter.optionIds)
+ ..remove(option.id);
+
+ _updateSelectOptions(context, options, selectedOptionIds);
+ } else {
+ final selectedOptionIds = widget.delegate.selectOption(
+ widget.filter.optionIds,
+ option.id,
+ widget.filter.condition,
+ );
+
+ _updateSelectOptions(context, options, selectedOptionIds);
+ }
+ }
+
+ void _updateSelectOptions(
+ BuildContext context,
+ List<SelectOptionPB> options,
+ Set<String> selectedOptionIds,
+ ) {
+ final optionIds =
+ options.map((e) => e.id).where(selectedOptionIds.contains).toList();
+ final newFilter = widget.filter.copyWith(optionIds: optionIds);
+ context.read<MobileFilterEditorCubit>().updateFilter(newFilter);
+ }
+}
+
+class _DateTimeFilterContentEditor extends StatelessWidget {
+ const _DateTimeFilterContentEditor({
+ required this.filter,
+ });
+
+ final DateTimeFilter filter;
+
+ @override
+ Widget build(BuildContext context) {
+ final isRange = filter.condition.isRange;
+ return MobileDatePicker(
+ isRange: isRange,
+ selectedDay: isRange ? filter.start : filter.timestamp,
+ startDay: isRange ? filter.start : null,
+ endDay: isRange ? filter.end : null,
+ onDaySelected: (selectedDay, _) {
+ final newFilter = isRange
+ ? filter.copyWithRange(start: selectedDay, end: null)
+ : filter.copyWithTimestamp(timestamp: selectedDay);
+ context.read<MobileFilterEditorCubit>().updateFilter(newFilter);
+ },
+ onRangeSelected: (start, end, _) {
+ final newFilter = filter.copyWithRange(
+ start: start,
+ end: end,
+ );
+ context.read<MobileFilterEditorCubit>().updateFilter(newFilter);
+ },
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet_cubit.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet_cubit.dart
new file mode 100644
index 0000000000..44380ad76a
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet_cubit.dart
@@ -0,0 +1,121 @@
+import 'package:appflowy/plugins/database/application/field/field_info.dart';
+import 'package:appflowy/plugins/database/application/field/filter_entities.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'database_filter_bottom_sheet_cubit.freezed.dart';
+
+class MobileFilterEditorCubit extends Cubit<MobileFilterEditorState> {
+ MobileFilterEditorCubit({
+ required this.pageController,
+ }) : super(MobileFilterEditorState.overview());
+
+ final PageController pageController;
+
+ void returnToOverview() {
+ _animateToPage(0);
+ emit(MobileFilterEditorState.overview());
+ }
+
+ void startCreatingFilter() {
+ _animateToPage(1);
+ emit(MobileFilterEditorState.create(filterField: null));
+ }
+
+ void startEditingFilterField(String filterId) {
+ _animateToPage(1);
+ emit(MobileFilterEditorState.editField(filterId: filterId, newField: null));
+ }
+
+ void changeField(FieldInfo field) {
+ emit(
+ state.maybeWhen(
+ create: (_) => MobileFilterEditorState.create(
+ filterField: field,
+ ),
+ editField: (filterId, _) => MobileFilterEditorState.editField(
+ filterId: filterId,
+ newField: field,
+ ),
+ orElse: () => state,
+ ),
+ );
+ }
+
+ void updateFilter(DatabaseFilter filter) {
+ emit(
+ state.maybeWhen(
+ editCondition: (filterId, newFilter, showSave) =>
+ MobileFilterEditorState.editCondition(
+ filterId: filterId,
+ newFilter: filter,
+ showSave: showSave,
+ ),
+ editContent: (filterId, _) => MobileFilterEditorState.editContent(
+ filterId: filterId,
+ newFilter: filter,
+ ),
+ orElse: () => state,
+ ),
+ );
+ }
+
+ void startEditingFilterCondition(
+ String filterId,
+ DatabaseFilter filter,
+ bool showSave,
+ ) {
+ _animateToPage(1);
+ emit(
+ MobileFilterEditorState.editCondition(
+ filterId: filterId,
+ newFilter: filter,
+ showSave: showSave,
+ ),
+ );
+ }
+
+ void startEditingFilterContent(String filterId, DatabaseFilter filter) {
+ _animateToPage(1);
+ emit(
+ MobileFilterEditorState.editContent(
+ filterId: filterId,
+ newFilter: filter,
+ ),
+ );
+ }
+
+ Future<void> _animateToPage(int page) async {
+ return pageController.animateToPage(
+ page,
+ duration: const Duration(milliseconds: 150),
+ curve: Curves.easeOut,
+ );
+ }
+}
+
+@freezed
+class MobileFilterEditorState with _$MobileFilterEditorState {
+ factory MobileFilterEditorState.overview() = _OverviewState;
+
+ factory MobileFilterEditorState.create({
+ required FieldInfo? filterField,
+ }) = _CreateState;
+
+ factory MobileFilterEditorState.editField({
+ required String filterId,
+ required FieldInfo? newField,
+ }) = _EditFieldState;
+
+ factory MobileFilterEditorState.editCondition({
+ required String filterId,
+ required DatabaseFilter newFilter,
+ required bool showSave,
+ }) = _EditConditionState;
+
+ factory MobileFilterEditorState.editContent({
+ required String filterId,
+ required DatabaseFilter newFilter,
+ }) = _EditContentState;
+}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_condition_list.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_condition_list.dart
new file mode 100644
index 0000000000..a2177479d9
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_condition_list.dart
@@ -0,0 +1,116 @@
+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart';
+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart';
+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart';
+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart';
+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart';
+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
+
+abstract class FilterCondition<C> {
+ static FilterCondition fromFieldType(FieldType fieldType) {
+ return switch (fieldType) {
+ FieldType.RichText || FieldType.URL => TextFilterCondition().as(),
+ FieldType.Number => NumberFilterCondition().as(),
+ FieldType.Checkbox => CheckboxFilterCondition().as(),
+ FieldType.Checklist => ChecklistFilterCondition().as(),
+ FieldType.SingleSelect => SingleSelectOptionFilterCondition().as(),
+ FieldType.MultiSelect => MultiSelectOptionFilterCondition().as(),
+ _ => MultiSelectOptionFilterCondition().as(),
+ };
+ }
+
+ List<(C, String)> get conditions;
+}
+
+mixin _GenericCastHelper {
+ FilterCondition<T> as<T>() => this as FilterCondition<T>;
+}
+
+final class TextFilterCondition
+ with _GenericCastHelper
+ implements FilterCondition<TextFilterConditionPB> {
+ @override
+ List<(TextFilterConditionPB, String)> get conditions {
+ return [
+ TextFilterConditionPB.TextContains,
+ TextFilterConditionPB.TextDoesNotContain,
+ TextFilterConditionPB.TextIs,
+ TextFilterConditionPB.TextIsNot,
+ TextFilterConditionPB.TextStartsWith,
+ TextFilterConditionPB.TextEndsWith,
+ TextFilterConditionPB.TextIsEmpty,
+ TextFilterConditionPB.TextIsNotEmpty,
+ ].map((e) => (e, e.filterName)).toList();
+ }
+}
+
+final class NumberFilterCondition
+ with _GenericCastHelper
+ implements FilterCondition<NumberFilterConditionPB> {
+ @override
+ List<(NumberFilterConditionPB, String)> get conditions {
+ return [
+ NumberFilterConditionPB.Equal,
+ NumberFilterConditionPB.NotEqual,
+ NumberFilterConditionPB.LessThan,
+ NumberFilterConditionPB.LessThanOrEqualTo,
+ NumberFilterConditionPB.GreaterThan,
+ NumberFilterConditionPB.GreaterThanOrEqualTo,
+ NumberFilterConditionPB.NumberIsEmpty,
+ NumberFilterConditionPB.NumberIsNotEmpty,
+ ].map((e) => (e, e.filterName)).toList();
+ }
+}
+
+final class CheckboxFilterCondition
+ with _GenericCastHelper
+ implements FilterCondition<CheckboxFilterConditionPB> {
+ @override
+ List<(CheckboxFilterConditionPB, String)> get conditions {
+ return [
+ CheckboxFilterConditionPB.IsChecked,
+ CheckboxFilterConditionPB.IsUnChecked,
+ ].map((e) => (e, e.filterName)).toList();
+ }
+}
+
+final class ChecklistFilterCondition
+ with _GenericCastHelper
+ implements FilterCondition<ChecklistFilterConditionPB> {
+ @override
+ List<(ChecklistFilterConditionPB, String)> get conditions {
+ return [
+ ChecklistFilterConditionPB.IsComplete,
+ ChecklistFilterConditionPB.IsIncomplete,
+ ].map((e) => (e, e.filterName)).toList();
+ }
+}
+
+final class SingleSelectOptionFilterCondition
+ with _GenericCastHelper
+ implements FilterCondition<SelectOptionFilterConditionPB> {
+ @override
+ List<(SelectOptionFilterConditionPB, String)> get conditions {
+ return [
+ SelectOptionFilterConditionPB.OptionIs,
+ SelectOptionFilterConditionPB.OptionIsNot,
+ SelectOptionFilterConditionPB.OptionIsEmpty,
+ SelectOptionFilterConditionPB.OptionIsNotEmpty,
+ ].map((e) => (e, e.i18n)).toList();
+ }
+}
+
+final class MultiSelectOptionFilterCondition
+ with _GenericCastHelper
+ implements FilterCondition<SelectOptionFilterConditionPB> {
+ @override
+ List<(SelectOptionFilterConditionPB, String)> get conditions {
+ return [
+ SelectOptionFilterConditionPB.OptionContains,
+ SelectOptionFilterConditionPB.OptionDoesNotContain,
+ SelectOptionFilterConditionPB.OptionIs,
+ SelectOptionFilterConditionPB.OptionIsNot,
+ SelectOptionFilterConditionPB.OptionIsEmpty,
+ SelectOptionFilterConditionPB.OptionIsNotEmpty,
+ ].map((e) => (e, e.i18n)).toList();
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dart
index 5ee05475a6..69141e2cee 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_sort_bottom_sheet.dart
@@ -350,7 +350,7 @@ class _SortItem extends StatelessWidget {
),
Positioned(
right: 8,
- top: 9,
+ top: 6,
child: InkWell(
onTap: () => context
.read<SortEditorBloc>()
@@ -515,6 +515,9 @@ class _SortDetailContent extends StatelessWidget {
isSelected: isSelected,
textColor: enabled ? null : Theme.of(context).disabledColor,
showTopBorder: false,
+ leftIcon: FlowySvg(
+ fieldInfo.fieldType.svgData,
+ ),
onTap: () {
if (isSelected) {
return;
diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart
index 1cbd35fb5d..a8bf8ccdaa 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart
@@ -1,6 +1,7 @@
import 'dart:typed_data';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/mobile/presentation/database/view/database_filter_bottom_sheet.dart';
import 'package:appflowy/plugins/database/application/field/field_info.dart';
import 'package:appflowy/plugins/database/grid/application/filter/select_option_loader.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart';
@@ -9,10 +10,13 @@ import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choic
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart';
+import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
import 'package:appflowy/util/int64_extension.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:fixnum/fixnum.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/widgets.dart';
abstract class DatabaseFilter {
const DatabaseFilter({
@@ -91,7 +95,16 @@ abstract class DatabaseFilter {
String get conditionName;
- String getDescription(FieldInfo field);
+ bool get canAttachContent;
+
+ String getContentDescription(FieldInfo field);
+
+ Widget getMobileDescription(
+ FieldInfo field, {
+ required VoidCallback onExpand,
+ required void Function(DatabaseFilter filter) onUpdate,
+ }) =>
+ const SizedBox.shrink();
Uint8List writeToBuffer();
}
@@ -112,7 +125,12 @@ final class TextFilter extends DatabaseFilter {
String get conditionName => condition.filterName;
@override
- String getDescription(FieldInfo field) {
+ bool get canAttachContent =>
+ condition != TextFilterConditionPB.TextIsEmpty &&
+ condition != TextFilterConditionPB.TextIsNotEmpty;
+
+ @override
+ String getContentDescription(FieldInfo field) {
final filterDesc = condition.choicechipPrefix;
if (condition == TextFilterConditionPB.TextIsEmpty ||
@@ -123,6 +141,22 @@ final class TextFilter extends DatabaseFilter {
return content.isEmpty ? filterDesc : "$filterDesc $content";
}
+ @override
+ Widget getMobileDescription(
+ FieldInfo field, {
+ required VoidCallback onExpand,
+ required void Function(DatabaseFilter filter) onUpdate,
+ }) {
+ return FilterItemInnerTextField(
+ content: content,
+ enabled: canAttachContent,
+ onSubmitted: (content) {
+ final newFilter = copyWith(content: content);
+ onUpdate(newFilter);
+ },
+ );
+ }
+
@override
Uint8List writeToBuffer() {
final filterPB = TextFilterPB()..condition = condition;
@@ -164,7 +198,12 @@ final class NumberFilter extends DatabaseFilter {
String get conditionName => condition.filterName;
@override
- String getDescription(FieldInfo field) {
+ bool get canAttachContent =>
+ condition != NumberFilterConditionPB.NumberIsEmpty &&
+ condition != NumberFilterConditionPB.NumberIsNotEmpty;
+
+ @override
+ String getContentDescription(FieldInfo field) {
if (condition == NumberFilterConditionPB.NumberIsEmpty ||
condition == NumberFilterConditionPB.NumberIsNotEmpty) {
return condition.shortName;
@@ -173,6 +212,22 @@ final class NumberFilter extends DatabaseFilter {
return "${condition.shortName} $content";
}
+ @override
+ Widget getMobileDescription(
+ FieldInfo field, {
+ required VoidCallback onExpand,
+ required void Function(DatabaseFilter filter) onUpdate,
+ }) {
+ return FilterItemInnerTextField(
+ content: content,
+ enabled: canAttachContent,
+ onSubmitted: (content) {
+ final newFilter = copyWith(content: content);
+ onUpdate(newFilter);
+ },
+ );
+ }
+
@override
Uint8List writeToBuffer() {
final filterPB = NumberFilterPB()..condition = condition;
@@ -212,7 +267,10 @@ final class CheckboxFilter extends DatabaseFilter {
String get conditionName => condition.filterName;
@override
- String getDescription(FieldInfo field) => condition.filterName;
+ bool get canAttachContent => false;
+
+ @override
+ String getContentDescription(FieldInfo field) => condition.filterName;
@override
Uint8List writeToBuffer() {
@@ -245,7 +303,10 @@ final class ChecklistFilter extends DatabaseFilter {
String get conditionName => condition.filterName;
@override
- String getDescription(FieldInfo field) => condition.filterName;
+ bool get canAttachContent => false;
+
+ @override
+ String getContentDescription(FieldInfo field) => condition.filterName;
@override
Uint8List writeToBuffer() {
@@ -280,15 +341,17 @@ final class SelectOptionFilter extends DatabaseFilter {
String get conditionName => condition.i18n;
@override
- String getDescription(FieldInfo field) {
- if (condition == SelectOptionFilterConditionPB.OptionIsEmpty ||
- condition == SelectOptionFilterConditionPB.OptionIsNotEmpty) {
+ bool get canAttachContent =>
+ condition != SelectOptionFilterConditionPB.OptionIsEmpty &&
+ condition != SelectOptionFilterConditionPB.OptionIsNotEmpty;
+
+ @override
+ String getContentDescription(FieldInfo field) {
+ if (!canAttachContent) {
return condition.i18n;
}
- final delegate = fieldType == FieldType.SingleSelect
- ? const SingleSelectOptionFilterDelegateImpl()
- : const MultiSelectOptionFilterDelegateImpl();
+ final delegate = makeDelegate(field);
final options = delegate.getOptions(field);
final optionNames =
@@ -296,14 +359,44 @@ final class SelectOptionFilter extends DatabaseFilter {
return "${condition.i18n} $optionNames";
}
+ @override
+ Widget getMobileDescription(
+ FieldInfo field, {
+ required VoidCallback onExpand,
+ required void Function(DatabaseFilter filter) onUpdate,
+ }) {
+ final delegate = makeDelegate(field);
+ final options = delegate
+ .getOptions(field)
+ .where((option) => optionIds.contains(option.id))
+ .toList();
+
+ return FilterItemInnerButton(
+ onTap: onExpand,
+ child: ListView.separated(
+ physics: const NeverScrollableScrollPhysics(),
+ scrollDirection: Axis.horizontal,
+ separatorBuilder: (context, index) => const HSpace(8),
+ itemCount: options.length,
+ itemBuilder: (context, index) => SelectOptionTag(
+ option: options[index],
+ fontSize: 14,
+ borderRadius: BorderRadius.circular(9),
+ padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+ ),
+ padding: const EdgeInsets.symmetric(vertical: 8),
+ ),
+ );
+ }
+
@override
Uint8List writeToBuffer() {
final filterPB = SelectOptionFilterPB()..condition = condition;
- if (condition != SelectOptionFilterConditionPB.OptionIsEmpty &&
- condition != SelectOptionFilterConditionPB.OptionIsNotEmpty) {
+ if (canAttachContent) {
filterPB.optionIds.addAll(optionIds);
}
+
return filterPB.writeToBuffer();
}
@@ -311,6 +404,12 @@ final class SelectOptionFilter extends DatabaseFilter {
SelectOptionFilterConditionPB? condition,
List<String>? optionIds,
}) {
+ final options = optionIds ?? this.optionIds;
+ if (fieldType == FieldType.SingleSelect &&
+ condition == SelectOptionFilterConditionPB.OptionIs &&
+ options.length > 1) {
+ options.removeRange(1, options.length);
+ }
return SelectOptionFilter(
filterId: filterId,
fieldId: fieldId,
@@ -319,6 +418,11 @@ final class SelectOptionFilter extends DatabaseFilter {
optionIds: optionIds ?? this.optionIds,
);
}
+
+ SelectOptionFilterDelegate makeDelegate(FieldInfo field) =>
+ field.fieldType == FieldType.SingleSelect
+ ? const SingleSelectOptionFilterDelegateImpl()
+ : const MultiSelectOptionFilterDelegateImpl();
}
enum DateTimeFilterCondition {
@@ -399,10 +503,18 @@ final class DateTimeFilter extends DatabaseFilter {
final DateTime? end;
@override
- String get conditionName => condition.name;
+ String get conditionName => condition.toCondition().filterName;
+
+ @override
+ bool get canAttachContent => ![
+ DateFilterConditionPB.DateStartIsEmpty,
+ DateFilterConditionPB.DateStartIsNotEmpty,
+ DateFilterConditionPB.DateEndIsEmpty,
+ DateFilterConditionPB.DateEndIsNotEmpty,
+ ].contains(condition);
@override
- String getDescription(FieldInfo field) {
+ String getContentDescription(FieldInfo field) {
return switch (condition) {
DateFilterConditionPB.DateStartIsEmpty ||
DateFilterConditionPB.DateStartIsNotEmpty ||
@@ -420,6 +532,29 @@ final class DateTimeFilter extends DatabaseFilter {
};
}
+ @override
+ Widget getMobileDescription(
+ FieldInfo field, {
+ required VoidCallback onExpand,
+ required void Function(DatabaseFilter filter) onUpdate,
+ }) {
+ String? text;
+
+ if (condition.isRange) {
+ text = "${start?.defaultFormat ?? ""} - ${end?.defaultFormat ?? ""}";
+ text = text == " - " ? null : text;
+ } else {
+ text = timestamp.defaultFormat;
+ }
+ return FilterItemInnerButton(
+ onTap: onExpand,
+ child: FlowyText(
+ text ?? "",
+ overflow: TextOverflow.ellipsis,
+ ),
+ );
+ }
+
@override
Uint8List writeToBuffer() {
final filterPB = DateFilterPB()..condition = condition;
@@ -520,7 +655,12 @@ final class TimeFilter extends DatabaseFilter {
String get conditionName => condition.filterName;
@override
- String getDescription(FieldInfo field) {
+ bool get canAttachContent =>
+ condition != NumberFilterConditionPB.NumberIsEmpty &&
+ condition != NumberFilterConditionPB.NumberIsNotEmpty;
+
+ @override
+ String getContentDescription(FieldInfo field) {
if (condition == NumberFilterConditionPB.NumberIsEmpty ||
condition == NumberFilterConditionPB.NumberIsNotEmpty) {
return condition.shortName;
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart
index 7c31879e2b..d3c2c00a43 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart
@@ -1,5 +1,6 @@
import 'dart:io';
+import 'package:appflowy/util/field_type_extension.dart';
import 'package:flutter/material.dart' hide Card;
import 'package:flutter/services.dart';
@@ -11,7 +12,6 @@ import 'package:appflowy/plugins/database/application/row/row_controller.dart';
import 'package:appflowy/plugins/database/board/application/board_actions_bloc.dart';
import 'package:appflowy/plugins/database/board/presentation/widgets/board_column_header.dart';
import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';
-import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';
import 'package:appflowy/plugins/database/tab_bar/desktop/setting_menu.dart';
import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';
import 'package:appflowy/plugins/database/widgets/card/card_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
index 90eb1ccece..aff7a9e507 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
@@ -4,7 +4,7 @@ import 'package:appflowy/plugins/database/application/database_controller.dart';
import 'package:appflowy/plugins/database/board/application/board_bloc.dart';
import 'package:appflowy/plugins/database/board/group_ext.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
-import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';
+import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_board/appflowy_board.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart
index 1c3c03290b..61b503f7d1 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart
@@ -49,7 +49,10 @@ class FilterEditorBloc extends Bloc<FilterEditorEvent, FilterEditorState> {
);
},
createFilter: (field) {
- return _createDefaultFilter(field);
+ return _createDefaultFilter(null, field);
+ },
+ changeFilteringField: (filterId, field) {
+ return _createDefaultFilter(filterId, field);
},
updateFilter: (filter) {
return _filterBackendSvc.updateFilter(
@@ -100,12 +103,14 @@ class FilterEditorBloc extends Bloc<FilterEditorEvent, FilterEditorState> {
}
Future<FlowyResult<void, FlowyError>> _createDefaultFilter(
+ String? filterId,
FieldInfo field,
) async {
final fieldId = field.id;
switch (field.fieldType) {
case FieldType.Checkbox:
return _filterBackendSvc.insertCheckboxFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: CheckboxFilterConditionPB.IsChecked,
);
@@ -114,50 +119,59 @@ class FilterEditorBloc extends Bloc<FilterEditorEvent, FilterEditorState> {
case FieldType.CreatedTime:
final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
return _filterBackendSvc.insertDateFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: DateFilterConditionPB.DateStartsOn,
timestamp: timestamp,
);
case FieldType.MultiSelect:
return _filterBackendSvc.insertSelectOptionFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: SelectOptionFilterConditionPB.OptionContains,
fieldType: FieldType.MultiSelect,
);
case FieldType.Checklist:
return _filterBackendSvc.insertChecklistFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: ChecklistFilterConditionPB.IsIncomplete,
);
case FieldType.Number:
return _filterBackendSvc.insertNumberFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: NumberFilterConditionPB.Equal,
);
case FieldType.Time:
return _filterBackendSvc.insertTimeFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: NumberFilterConditionPB.Equal,
);
case FieldType.RichText:
return _filterBackendSvc.insertTextFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: TextFilterConditionPB.TextContains,
content: '',
);
case FieldType.SingleSelect:
return _filterBackendSvc.insertSelectOptionFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: SelectOptionFilterConditionPB.OptionIs,
fieldType: FieldType.SingleSelect,
);
case FieldType.URL:
return _filterBackendSvc.insertURLFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: TextFilterConditionPB.TextContains,
);
case FieldType.Media:
return _filterBackendSvc.insertMediaFilter(
+ filterId: filterId,
fieldId: fieldId,
condition: MediaFilterConditionPB.MediaIsNotEmpty,
);
@@ -177,6 +191,10 @@ class FilterEditorEvent with _$FilterEditorEvent {
const factory FilterEditorEvent.createFilter(FieldInfo field) = _CreateFilter;
const factory FilterEditorEvent.updateFilter(DatabaseFilter filter) =
_UpdateFilter;
+ const factory FilterEditorEvent.changeFilteringField(
+ String filterId,
+ FieldInfo field,
+ ) = _ChangeFilteringField;
const factory FilterEditorEvent.deleteFilter(String filterId) = _DeleteFilter;
}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart
index 45363ad60e..6db41242e6 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart
@@ -38,7 +38,7 @@ class ChecklistFilterChoicechip extends StatelessWidget {
builder: (context, filter, field) {
return ChoiceChipButton(
fieldInfo: field,
- filterDesc: filter.getDescription(field),
+ filterDesc: filter.getContentDescription(field),
);
},
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
index 3913be1ce3..c36f5edecd 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
@@ -42,7 +42,7 @@ class DateFilterChoicechip extends StatelessWidget {
builder: (context, filter, field) {
return ChoiceChipButton(
fieldInfo: field,
- filterDesc: filter.getDescription(field),
+ filterDesc: filter.getContentDescription(field),
);
},
),
@@ -156,9 +156,7 @@ class _DateFilterEditorState extends State<DateFilterEditor> {
}
Widget _buildFilterContentField(DateTimeFilter filter) {
- final isRange =
- filter.condition == DateFilterConditionPB.DateStartsBetween ||
- filter.condition == DateFilterConditionPB.DateEndsBetween;
+ final isRange = filter.condition.isRange;
String? text;
if (isRange) {
@@ -365,6 +363,15 @@ extension DateFilterConditionPBExtension on DateFilterConditionPB {
};
}
+ bool get isRange {
+ return switch (this) {
+ DateFilterConditionPB.DateStartsBetween ||
+ DateFilterConditionPB.DateEndsBetween =>
+ true,
+ _ => false,
+ };
+ }
+
DateTimeFilterCondition toCondition() {
return switch (this) {
DateFilterConditionPB.DateStartsOn ||
@@ -386,10 +393,10 @@ extension DateFilterConditionPBExtension on DateFilterConditionPB {
DateFilterConditionPB.DateEndsBetween =>
DateTimeFilterCondition.between,
DateFilterConditionPB.DateStartIsEmpty ||
- DateFilterConditionPB.DateStartIsEmpty =>
+ DateFilterConditionPB.DateEndIsEmpty =>
DateTimeFilterCondition.isEmpty,
DateFilterConditionPB.DateStartIsNotEmpty ||
- DateFilterConditionPB.DateStartIsNotEmpty =>
+ DateFilterConditionPB.DateEndIsNotEmpty =>
DateTimeFilterCondition.isNotEmpty,
_ => throw ArgumentError(),
};
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart
index c9466f3d53..3f9fe361de 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart
@@ -40,7 +40,7 @@ class NumberFilterChoiceChip extends StatelessWidget {
builder: (context, filter, field) {
return ChoiceChipButton(
fieldInfo: field,
- filterDesc: filter.getDescription(field),
+ filterDesc: filter.getContentDescription(field),
);
},
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
index 17bed513be..4a50fff143 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/plugins/database/application/field/field_info.dart';
import 'package:appflowy/plugins/database/application/field/filter_entities.dart';
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
-import 'package:appflowy/plugins/database/grid/application/filter/select_option_loader.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
@@ -38,7 +37,7 @@ class SelectOptionFilterChoicechip extends StatelessWidget {
builder: (context, filter, field) {
return ChoiceChipButton(
fieldInfo: field,
- filterDesc: filter.getDescription(field),
+ filterDesc: filter.getContentDescription(field),
);
},
),
@@ -81,7 +80,7 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {
SelectOptionFilterConditionPB.OptionIsEmpty,
SelectOptionFilterConditionPB.OptionIsNotEmpty,
].contains(filter.condition)) {
- final delegate = makeDelegate(field);
+ final delegate = filter.makeDelegate(field);
slivers
..add(const SliverToBoxAdapter(child: VSpace(4)))
..add(
@@ -150,9 +149,4 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {
),
);
}
-
- SelectOptionFilterDelegate makeDelegate(FieldInfo field) =>
- field.fieldType == FieldType.SingleSelect
- ? const SingleSelectOptionFilterDelegateImpl()
- : const MultiSelectOptionFilterDelegateImpl();
}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart
index cbbff3d40f..6fe184fbe1 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart
@@ -40,7 +40,7 @@ class TextFilterChoicechip extends StatelessWidget {
builder: (context, filter, field) {
return ChoiceChipButton(
fieldInfo: field,
- filterDesc: filter.getDescription(field),
+ filterDesc: filter.getContentDescription(field),
);
},
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart
index 657974c6f5..3536d6cbe9 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart
@@ -32,7 +32,7 @@ class URLFilterChoicechip extends StatelessWidget {
builder: (context, filter, field) {
return ChoiceChipButton(
fieldInfo: field,
- filterDesc: filter.getDescription(field),
+ filterDesc: filter.getContentDescription(field),
);
},
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_type_extension.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_type_extension.dart
index c4d446f216..c59327113b 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_type_extension.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_type_extension.dart
@@ -1,28 +1,5 @@
import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';
-extension FieldTypeListExtension on FieldType {
- bool get canEditHeader => switch (this) {
- FieldType.MultiSelect => true,
- FieldType.SingleSelect => true,
- _ => false,
- };
-
- bool get canCreateNewGroup => switch (this) {
- FieldType.MultiSelect => true,
- FieldType.SingleSelect => true,
- _ => false,
- };
-
- bool get canDeleteGroup => switch (this) {
- FieldType.URL ||
- FieldType.SingleSelect ||
- FieldType.MultiSelect ||
- FieldType.DateTime =>
- true,
- _ => false,
- };
-}
-
extension RowDetailAccessoryExtension on FieldType {
bool get showRowDetailAccessory => switch (this) {
FieldType.Media => false,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dart
index 4c8878d800..76f77adb60 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/mobile/mobile_tab_bar_header.dart
@@ -43,6 +43,14 @@ class MobileTabBarHeader extends StatelessWidget {
return MobileDatabaseControls(
controller: state
.tabBarControllerByViewId[currentView.viewId]!.controller,
+ features: switch (currentView.layout) {
+ ViewLayoutPB.Board => [MobileDatabaseControlFeatures.filter],
+ ViewLayoutPB.Grid => [
+ MobileDatabaseControlFeatures.sort,
+ MobileDatabaseControlFeatures.filter,
+ ],
+ _ => [],
+ },
);
},
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/extension.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/extension.dart
index 47bfc661b2..dbed10889b 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/extension.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/extension.dart
@@ -70,6 +70,7 @@ class SelectOptionTag extends StatelessWidget {
this.onRemove,
this.textAlign,
this.isExpanded = false,
+ this.borderRadius,
required this.padding,
}) : assert(option != null || name != null && color != null);
@@ -80,6 +81,7 @@ class SelectOptionTag extends StatelessWidget {
final TextStyle? textStyle;
final void Function(String)? onRemove;
final EdgeInsets padding;
+ final BorderRadius? borderRadius;
final TextAlign? textAlign;
final bool isExpanded;
@@ -99,11 +101,8 @@ class SelectOptionTag extends StatelessWidget {
padding: onRemove == null ? padding : padding.copyWith(right: 2.0),
decoration: BoxDecoration(
color: optionColor,
- borderRadius: BorderRadius.all(
- Radius.circular(
- UniversalPlatform.isDesktopOrWeb ? 6 : 11,
- ),
- ),
+ borderRadius: borderRadius ??
+ BorderRadius.circular(UniversalPlatform.isDesktopOrWeb ? 6 : 11),
),
child: Row(
mainAxisSize: MainAxisSize.min,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart
index cba7194a99..8f7e1c5a3c 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart
@@ -169,15 +169,15 @@ class _MobileSelectOptionEditorState extends State<MobileSelectOptionEditor> {
.add(const SelectOptionCellEditorEvent.createOption());
searchController.clear();
},
- onCheck: (option, value) {
- if (value) {
+ onCheck: (option, isSelected) {
+ if (isSelected) {
context
.read<SelectOptionCellEditorBloc>()
- .add(SelectOptionCellEditorEvent.selectOption(option.id));
+ .add(SelectOptionCellEditorEvent.unselectOption(option.id));
} else {
context
.read<SelectOptionCellEditorBloc>()
- .add(SelectOptionCellEditorEvent.unselectOption(option.id));
+ .add(SelectOptionCellEditorEvent.selectOption(option.id));
}
},
onMoreOptions: (option) {
@@ -275,11 +275,13 @@ class _OptionList extends StatelessWidget {
cells.addAll(
state.options.map(
- (option) => _SelectOption(
- fieldType: fieldType,
+ (option) => MobileSelectOption(
+ indicator: fieldType == FieldType.MultiSelect
+ ? MobileSelectedOptionIndicator.multi
+ : MobileSelectedOptionIndicator.single,
option: option,
- checked: state.selectedOptions.contains(option),
- onCheck: (value) => onCheck(option, value),
+ isSelected: state.selectedOptions.contains(option),
+ onTap: (value) => onCheck(option, value),
onMoreOptions: () => onMoreOptions(option),
),
),
@@ -298,20 +300,23 @@ class _OptionList extends StatelessWidget {
}
}
-class _SelectOption extends StatelessWidget {
- const _SelectOption({
- required this.fieldType,
+class MobileSelectOption extends StatelessWidget {
+ const MobileSelectOption({
+ super.key,
+ required this.indicator,
required this.option,
- required this.checked,
- required this.onCheck,
- required this.onMoreOptions,
+ required this.isSelected,
+ required this.onTap,
+ this.showMoreOptionsButton = true,
+ this.onMoreOptions,
});
- final FieldType fieldType;
+ final MobileSelectedOptionIndicator indicator;
final SelectOptionPB option;
- final bool checked;
- final void Function(bool value) onCheck;
- final VoidCallback onMoreOptions;
+ final bool isSelected;
+ final void Function(bool value) onTap;
+ final bool showMoreOptionsButton;
+ final VoidCallback? onMoreOptions;
@override
Widget build(BuildContext context) {
@@ -320,7 +325,7 @@ class _SelectOption extends StatelessWidget {
child: GestureDetector(
// no need to add click effect, so using gesture detector
behavior: HitTestBehavior.translucent,
- onTap: () => onCheck(!checked),
+ onTap: () => onTap(isSelected),
child: Row(
children: [
// checked or selected icon
@@ -328,8 +333,8 @@ class _SelectOption extends StatelessWidget {
height: 20,
width: 20,
child: _IsSelectedIndicator(
- fieldType: fieldType,
- isSelected: checked,
+ indicator: indicator,
+ isSelected: isSelected,
),
),
// padding
@@ -349,14 +354,16 @@ class _SelectOption extends StatelessWidget {
),
),
),
- const HSpace(24),
- // more options
- FlowyIconButton(
- icon: const FlowySvg(
- FlowySvgs.m_field_more_s,
+ if (showMoreOptionsButton) ...[
+ const HSpace(24),
+ // more options
+ FlowyIconButton(
+ icon: const FlowySvg(
+ FlowySvgs.m_field_more_s,
+ ),
+ onPressed: onMoreOptions,
),
- onPressed: onMoreOptions,
- ),
+ ],
],
),
),
@@ -496,13 +503,15 @@ class _MoreOptionsState extends State<_MoreOptions> {
}
}
+enum MobileSelectedOptionIndicator { single, multi }
+
class _IsSelectedIndicator extends StatelessWidget {
const _IsSelectedIndicator({
- required this.fieldType,
+ required this.indicator,
required this.isSelected,
});
- final FieldType fieldType;
+ final MobileSelectedOptionIndicator indicator;
final bool isSelected;
@override
@@ -514,7 +523,7 @@ class _IsSelectedIndicator extends StatelessWidget {
color: Theme.of(context).colorScheme.primary,
),
child: Center(
- child: fieldType == FieldType.MultiSelect
+ child: indicator == MobileSelectedOptionIndicator.multi
? FlowySvg(
FlowySvgs.checkmark_tiny_s,
color: Theme.of(context).colorScheme.onPrimary,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.dart
index 88d8c02c6d..6394a2ac1a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/mobile_database_controls.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/bottom_sheet/bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/database/view/database_field_list.dart';
+import 'package:appflowy/mobile/presentation/database/view/database_filter_bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/database/view/database_sort_bottom_sheet.dart';
import 'package:appflowy/plugins/database/application/database_controller.dart';
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
@@ -13,13 +14,17 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+enum MobileDatabaseControlFeatures { sort, filter }
+
class MobileDatabaseControls extends StatelessWidget {
const MobileDatabaseControls({
super.key,
required this.controller,
+ required this.features,
});
final DatabaseController controller;
+ final List<MobileDatabaseControlFeatures> features;
@override
Widget build(BuildContext context) {
@@ -48,14 +53,24 @@ class MobileDatabaseControls extends StatelessWidget {
return SeparatedRow(
separatorBuilder: () => const HSpace(8.0),
children: [
- _DatabaseControlButton(
- icon: FlowySvgs.sort_ascending_s,
- count: context.watch<SortEditorBloc>().state.sorts.length,
- onTap: () => _showEditSortPanelFromToolbar(
- context,
- controller,
+ if (features.contains(MobileDatabaseControlFeatures.sort))
+ _DatabaseControlButton(
+ icon: FlowySvgs.sort_ascending_s,
+ count: context.watch<SortEditorBloc>().state.sorts.length,
+ onTap: () => _showEditSortPanelFromToolbar(
+ context,
+ controller,
+ ),
+ ),
+ if (features.contains(MobileDatabaseControlFeatures.filter))
+ _DatabaseControlButton(
+ icon: FlowySvgs.filter_s,
+ count: context.watch<FilterEditorBloc>().state.filters.length,
+ onTap: () => _showEditFilterPanelFromToolbar(
+ context,
+ controller,
+ ),
),
- ),
_DatabaseControlButton(
icon: FlowySvgs.m_field_hide_s,
onTap: () => _showDatabaseFieldListFromToolbar(
@@ -152,3 +167,22 @@ void _showEditSortPanelFromToolbar(
},
);
}
+
+void _showEditFilterPanelFromToolbar(
+ BuildContext context,
+ DatabaseController databaseController,
+) {
+ showMobileBottomSheet(
+ context,
+ showDragHandle: true,
+ showDivider: false,
+ useSafeArea: false,
+ backgroundColor: AFThemeExtension.of(context).background,
+ builder: (_) {
+ return BlocProvider.value(
+ value: context.read<FilterEditorBloc>(),
+ child: const MobileFilterEditor(),
+ );
+ },
+ );
+}
diff --git a/frontend/appflowy_flutter/lib/util/field_type_extension.dart b/frontend/appflowy_flutter/lib/util/field_type_extension.dart
index 34da0ef09c..e7b9d10911 100644
--- a/frontend/appflowy_flutter/lib/util/field_type_extension.dart
+++ b/frontend/appflowy_flutter/lib/util/field_type_extension.dart
@@ -93,6 +93,14 @@ extension FieldTypeExtension on FieldType {
_ => throw UnimplementedError(),
};
+ bool get isDate => switch (this) {
+ FieldType.DateTime ||
+ FieldType.CreatedTime ||
+ FieldType.LastEditedTime =>
+ true,
+ _ => false,
+ };
+
bool get canBeGroup => switch (this) {
FieldType.URL ||
FieldType.Checkbox ||
diff --git a/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseWithFilter.cy.tsx b/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseWithFilter.cy.tsx
index a76678db78..2ab6500f3f 100644
--- a/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseWithFilter.cy.tsx
+++ b/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseWithFilter.cy.tsx
@@ -85,7 +85,7 @@ describe('<Database /> with filters and sorts', () => {
// the sixth filter should be 'Checklist', the value should be 'is completed'
cy.get('@filterConditions').eq(5).as('filterCondition');
cy.get('@filterCondition').contains('Checklist');
- cy.get('@filterCondition').contains('is complete');
+ cy.get('@filterCondition').contains('Is complete');
cy.get('@filterCondition').click();
cy.clickOutside();
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
index 5f978a5a38..919d24482e 100644
--- a/frontend/resources/translations/en.json
+++ b/frontend/resources/translations/en.json
@@ -1226,7 +1226,7 @@
"group": "Group",
"addFilter": "Add Filter",
"deleteFilter": "Delete filter",
- "filterBy": "Filter by...",
+ "filterBy": "Filter by",
"typeAValue": "Type a value...",
"layout": "Layout",
"databaseLayout": "Layout",
@@ -1243,6 +1243,13 @@
"deleteView": "Delete view",
"numberOfVisibleFields": "{} shown"
},
+ "filter": {
+ "empty": "No active filters",
+ "addFilter": "Add filter",
+ "cannotFindCreatableField": "Cannot find a suitable field to filter by",
+ "conditon": "Condition",
+ "where": "Where"
+ },
"textFilter": {
"contains": "Contains",
"doesNotContain": "Does not contain",
@@ -1268,8 +1275,8 @@
}
},
"checklistFilter": {
- "isComplete": "is complete",
- "isIncomplted": "is incomplete"
+ "isComplete": "Is complete",
+ "isIncomplted": "Is incomplete"
},
"selectOptionFilter": {
"is": "Is",
@@ -1395,7 +1402,7 @@
"empty": "No active sorts",
"cannotFindCreatableField": "Cannot find a suitable field to sort by",
"deleteAllSorts": "Delete all sorts",
- "addSort": "Add new sort",
+ "addSort": "Add sort",
"sortsActive": "Cannot {intention} while sorting",
"removeSorting": "Would you like to remove all the sorts in this view and continue?",
"fieldInUse": "You are already sorting by this field"