From 9d28360887338320f265ae92627b8684b1d4b118 Mon Sep 17 00:00:00 2001 From: Richard Shiue <71320345+richardshiue@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:27:03 +0800 Subject: [PATCH] fix: mobile ui improv and bugs (#4567) * fix: quick edit field bottom sheet header * fix: field editor appbar regression This stems from moving to a standardized FlowyAppBar --- .../database/field/mobile_create_field_screen.dart | 2 +- .../database/field/mobile_edit_field_screen.dart | 3 ++- .../database/field/mobile_field_bottom_sheets.dart | 3 ++- ...ype_option_editor.dart => mobile_full_field_editor.dart} | 0 .../database/field/mobile_quick_field_editor.dart | 6 ++---- .../plugins/database/application/cell/cell_controller.dart | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename frontend/appflowy_flutter/lib/mobile/presentation/database/field/{mobile_field_type_option_editor.dart => mobile_full_field_editor.dart} (100%) diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_create_field_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_create_field_screen.dart index 587194dea1..c919d3de8f 100644 --- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_create_field_screen.dart +++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_create_field_screen.dart @@ -1,6 +1,6 @@ import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/mobile/presentation/base/app_bar.dart'; -import 'package:appflowy/mobile/presentation/database/field/mobile_field_type_option_editor.dart'; +import 'package:appflowy/mobile/presentation/database/field/mobile_full_field_editor.dart'; import 'package:appflowy/util/field_type_extension.dart'; import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart'; import 'package:easy_localization/easy_localization.dart'; diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart index 9fbe6e7d29..958c282bbb 100644 --- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart +++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart @@ -1,6 +1,6 @@ import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/mobile/presentation/base/app_bar.dart'; -import 'package:appflowy/mobile/presentation/database/field/mobile_field_type_option_editor.dart'; +import 'package:appflowy/mobile/presentation/database/field/mobile_full_field_editor.dart'; import 'package:appflowy/plugins/database/application/field/field_backend_service.dart'; import 'package:appflowy/plugins/database/application/field/field_info.dart'; import 'package:appflowy/plugins/database/application/field/field_service.dart'; @@ -56,6 +56,7 @@ class _MobileEditPropertyScreenState extends State { child: Scaffold( appBar: FlowyAppBar( titleText: LocaleKeys.grid_field_editProperty.tr(), + onTapLeading: () => context.pop(_fieldOptionValues), ), body: MobileFieldEditor( mode: FieldOptionMode.edit, diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_bottom_sheets.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_bottom_sheets.dart index ccdc102985..2388d771cc 100644 --- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_bottom_sheets.dart +++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_bottom_sheets.dart @@ -13,7 +13,7 @@ import 'package:go_router/go_router.dart'; import 'mobile_create_field_screen.dart'; import 'mobile_edit_field_screen.dart'; import 'mobile_field_picker_list.dart'; -import 'mobile_field_type_option_editor.dart'; +import 'mobile_full_field_editor.dart'; import 'mobile_quick_field_editor.dart'; const mobileSupportedFieldTypes = [ @@ -113,6 +113,7 @@ void showQuickEditField( padding: EdgeInsets.zero, backgroundColor: Theme.of(context).colorScheme.secondaryContainer, resizeToAvoidBottomInset: true, + showDragHandle: true, builder: (context) { return SingleChildScrollView( child: QuickEditField( diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_full_field_editor.dart similarity index 100% rename from frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dart rename to frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_full_field_editor.dart diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart index 9dce31cf85..593eaf265a 100644 --- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart +++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart @@ -1,9 +1,8 @@ import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; -import 'package:appflowy/mobile/presentation/base/app_bar_actions.dart'; import 'package:appflowy/mobile/presentation/database/card/card_detail/widgets/widgets.dart'; import 'package:appflowy/mobile/presentation/database/field/mobile_field_bottom_sheets.dart'; -import 'package:appflowy/mobile/presentation/database/field/mobile_field_type_option_editor.dart'; +import 'package:appflowy/mobile/presentation/database/field/mobile_full_field_editor.dart'; import 'package:appflowy/mobile/presentation/widgets/widgets.dart'; import 'package:appflowy/plugins/database/application/field/field_backend_service.dart'; import 'package:appflowy/plugins/database/application/field/field_info.dart'; @@ -63,7 +62,7 @@ class _QuickEditFieldState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const AppBarCloseButton(), + const VSpace(16), OptionTextField( controller: controller, type: _fieldOptionValues.type, @@ -193,7 +192,6 @@ class _QuickEditFieldState extends State { }, ), ], - const VSpace(38), ], ); } diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dart index 718c581b6e..65c17e763c 100644 --- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dart +++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dart @@ -155,7 +155,7 @@ class CellController { /// and load from disk if it doesn't exist. You can set [loadIfNotExist] to /// false to disable this behavior. T? getCellData({bool loadIfNotExist = true}) { - final data = _cellCache.get(_cellContext); + final T? data = _cellCache.get(_cellContext); if (data == null && loadIfNotExist) { _loadData(); }