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

chore: upgrade flutter to 3.13.9 (#3936)

Browse Source
This commit is contained in:
Lucas.Xu 2023-11-14 22:33:07 +08:00 committed by GitHub
parent 1c500fbfc5
commit 6a9866b9d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
116 changed files with 312 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/flutter_ci.yaml vendored
View File

@ -23,7 +23,7 @@ on:
env:
CARGO_TERM_COLOR: always
FLUTTER_VERSION: "3.10.4"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"
CARGO_MAKE_VERSION: "0.36.6"

2
.github/workflows/mobile_ci.yaml vendored
View File

@ -18,7 +18,7 @@ on:
- "!frontend/appflowy_tauri/**"
env:
FLUTTER_VERSION: "3.10.1"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"
concurrency:

2
.github/workflows/release.yml vendored
View File

@ -6,7 +6,7 @@ on:
- "*"
env:
FLUTTER_VERSION: "3.10.1"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"
jobs:

2
.github/workflows/rust_coverage.yml vendored
View File

@ -11,7 +11,7 @@ on:
env:
CARGO_TERM_COLOR: always
FLUTTER_VERSION: "3.10.1"
FLUTTER_VERSION: "3.13.9"
RUST_TOOLCHAIN: "1.70"
jobs:

4
frontend/appflowy_flutter/README.md
View File

@ -1,7 +1,7 @@
<h1 align="center" style="margin:0"> AppFlowy_Flutter</h1>
<div align="center">
<img src="https://img.shields.io/badge/Flutter-v3.10.1-blue"/>
<img src="https://img.shields.io/badge/Rust-v1.65-orange"/>
<img src="https://img.shields.io/badge/Flutter-v3.13.19-blue"/>
<img src="https://img.shields.io/badge/Rust-v1.70-orange"/>
</div>
> Documentation for Contributors

6
frontend/appflowy_flutter/integration_test/database_share_test.dart
View File

@ -34,7 +34,7 @@ void main() {
false,
false,
false,
false
false,
];
for (final (index, content) in checkboxCells.indexed) {
await tester.assertCheckboxCell(
@ -54,7 +54,7 @@ void main() {
'10',
'11',
'12',
''
'',
];
for (final (index, content) in numberCells.indexed) {
await tester.assertCellContent(
@ -152,7 +152,7 @@ void main() {
'Jun 16, 2023',
'',
'',
''
'',
];
for (final (index, content) in dateCells.indexed) {
await tester.assertDateCellInGrid(

2
frontend/appflowy_flutter/integration_test/document/document_copy_and_paste_test.dart
View File

@ -219,7 +219,7 @@ void main() {
expect(node.delta!.toJson(), [
{
'insert': text,
'attributes': {'href': url}
'attributes': {'href': url},
}
]);
},

2
frontend/appflowy_flutter/integration_test/document/document_with_cover_image_test.dart
View File

@ -2,8 +2,8 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart';
import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';

2
frontend/appflowy_flutter/integration_test/util/editor_test_operations.dart
View File

@ -12,9 +12,9 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emo
import 'package:appflowy/plugins/inline_actions/widgets/inline_actions_handler.dart';
import 'package:appflowy_editor/appflowy_editor.dart' hide Log;
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
import 'package:flutter_test/flutter_test.dart';
import 'util.dart';

2
frontend/appflowy_flutter/integration_test/util/emoji.dart
View File

@ -1,4 +1,4 @@
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
import 'package:flutter_test/flutter_test.dart';
import 'base.dart';

2
frontend/appflowy_flutter/integration_test/util/mock/mock_openai_repository.dart
View File

@ -15,7 +15,7 @@ class MyMockClient extends Mock implements http.Client {
if (requestType == 'POST' &&
requestUri == OpenAIRequestType.textCompletion.uri) {
final responseHeaders = <String, String>{
'content-type': 'text/event-stream'
'content-type': 'text/event-stream',
};
final responseBody = Stream.fromIterable([
utf8.encode(

2
frontend/appflowy_flutter/ios/Podfile.lock
View File

@ -171,7 +171,7 @@ SPEC CHECKSUMS:
device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
flowy_infra_ui: 0455e1fa8c51885aa1437848e361e99419f34ebc
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c

2
frontend/appflowy_flutter/ios/Runner.xcodeproj/project.pbxproj
View File

@ -143,7 +143,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {

2
frontend/appflowy_flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_view_item_body.dart
View File

@ -98,7 +98,7 @@ class MobileViewItemBottomSheetBody extends StatelessWidget {
? MobileViewItemBottomSheetBodyAction.removeFromFavorites
: MobileViewItemBottomSheetBodyAction.addToFavorites,
),
)
),
],
);
}

2
frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_view_item_header.dart
View File

@ -47,7 +47,7 @@ class MobileViewItemBottomSheetHeader extends StatelessWidget {
onPressed: () {
context.pop();
},
)
),
],
);
}

2
frontend/appflowy_flutter/lib/mobile/presentation/details_placeholder_page.dart
View File

@ -91,7 +91,7 @@ class DetailsPlaceholderScreenState extends State<DetailsPlaceholderScreen> {
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
),
),
]
],
],
),
);

2
frontend/appflowy_flutter/lib/mobile/presentation/favorite/mobile_favorite_folder.dart
View File

@ -34,7 +34,7 @@ class MobileFavoritePageFolder extends StatelessWidget {
),
BlocProvider(
create: (_) => FavoriteBloc()..add(const FavoriteEvent.initial()),
)
),
],
child: MultiBlocListener(
listeners: [

2
frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_folders.dart
View File

@ -34,7 +34,7 @@ class MobileFolders extends StatelessWidget {
),
BlocProvider(
create: (_) => FavoriteBloc()..add(const FavoriteEvent.initial()),
)
),
],
child: MultiBlocListener(
listeners: [

6
frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart
View File

@ -66,7 +66,7 @@ class MobileHomePageHeader extends StatelessWidget {
icon: const Icon(
Icons.arrow_drop_down,
),
)
),
],
),
FlowyText.regular(
@ -76,7 +76,7 @@ class MobileHomePageHeader extends StatelessWidget {
fontSize: 12,
color: theme.colorScheme.onSurface,
overflow: TextOverflow.ellipsis,
)
),
],
),
),
@ -87,7 +87,7 @@ class MobileHomePageHeader extends StatelessWidget {
icon: const FlowySvg(
FlowySvgs.m_setting_m,
),
)
),
],
),
);

4
frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_trash_page.dart
View File

@ -51,7 +51,7 @@ class MobileHomeTrashPage extends StatelessWidget {
trashBloc: trashBloc,
type: _TrashActionType.restoreAll,
),
)
),
],
),
);
@ -214,7 +214,7 @@ class _DeletedFilesListView extends StatelessWidget {
gravity: ToastGravity.BOTTOM,
);
},
)
),
],
),
),

2
frontend/appflowy_flutter/lib/mobile/presentation/home/personal_folder/mobile_home_personal_folder.dart
View File

@ -64,7 +64,7 @@ class MobilePersonalFolder extends StatelessWidget {
MobilePaneActionType.more,
]),
),
)
),
],
);
},

2
frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_home_recent_views.dart
View File

@ -48,7 +48,7 @@ class _MobileRecentFolderState extends State<MobileRecentFolder> {
// the recent views are in reverse order
recentViews: recentViews,
),
const VSpace(12.0)
const VSpace(12.0),
],
);
},

2
frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart
View File

@ -312,7 +312,7 @@ class _SingleMobileInnerViewItemState extends State<SingleMobileInnerViewItem> {
fontSize: 18.0,
overflow: TextOverflow.ellipsis,
),
)
),
];
// hover action

2
frontend/appflowy_flutter/lib/mobile/presentation/setting/appearance_setting_group.dart
View File

@ -40,7 +40,7 @@ class _AppearanceSettingGroupState extends State<AppearanceSettingGroup> {
color: theme.colorScheme.onSurface,
),
),
const Icon(Icons.chevron_right)
const Icon(Icons.chevron_right),
],
),
onTap: () {

2
frontend/appflowy_flutter/lib/mobile/presentation/setting/personal_info/edit_username_bottom_sheet.dart
View File

@ -71,7 +71,7 @@ class _EditUsernameBottomSheetState extends State<EditUsernameBottomSheet> {
onPressed: () {
widget.context.pop();
},
)
),
],
),
const SizedBox(

2
frontend/appflowy_flutter/lib/mobile/presentation/setting/personal_info/personal_info_setting_group.dart
View File

@ -62,7 +62,7 @@ class PersonalInfoSettingGroup extends StatelessWidget {
},
);
},
)
),
],
);
},

4
frontend/appflowy_flutter/lib/mobile/presentation/widgets/flowy_mobile_state_container.dart
View File

@ -92,8 +92,8 @@ class FlowyMobileStateContainer extends StatelessWidget {
],
);
},
)
]
),
],
],
),
),

2
frontend/appflowy_flutter/lib/mobile/presentation/widgets/show_flowy_mobile_bottom_sheet.dart
View File

@ -48,7 +48,7 @@ class _BottomSheetTitle extends StatelessWidget {
onPressed: () {
context.pop();
},
)
),
],
);
}

2
frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker.dart
View File

@ -1,9 +1,9 @@
import 'package:appflowy/plugins/base/emoji/emoji_picker_header.dart';
import 'package:appflowy/plugins/base/emoji/emoji_search_bar.dart';
import 'package:appflowy/plugins/base/emoji/emoji_skin_tone.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
// use a global value to store the selected emoji to prevent reloading every time.
EmojiData? _cachedEmojiData;

2
frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker_header.dart
View File

@ -1,7 +1,7 @@
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
class FlowyEmojiHeader extends StatelessWidget {
const FlowyEmojiHeader({

2
frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker_i18n.dart
View File

@ -1,6 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
class FlowyEmojiPickerI18n extends EmojiPickerI18n {
@override

2
frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_search_bar.dart
View File

@ -3,10 +3,10 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/base/emoji/emoji_skin_tone.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
typedef EmojiKeywordChangedCallback = void Function(String keyword);
typedef EmojiSkinToneChanged = void Function(EmojiSkinTone skinTone);

2
frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_skin_tone.dart
View File

@ -1,10 +1,10 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:emoji_mart/emoji_mart.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
// use a temporary global value to store last selected skin tone
EmojiSkinTone? lastSelectedEmojiSkinTone;

2
frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker.dart
View File

@ -111,7 +111,7 @@ class _FlowyIconPickerState extends State<FlowyIconPicker>
LocaleKeys.emoji_emojiTab.tr(),
),
),
)
),
],
),
);

2
frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_controller.dart
View File

@ -219,7 +219,7 @@ class CellController<T, D> extends Equatable {
@override
List<Object> get props => [
_cellCache.get(_cacheKey) ?? "",
_cellContext.rowId + _cellContext.fieldInfo.id
_cellContext.rowId + _cellContext.fieldInfo.id,
];
}

2
frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_controller.dart
View File

@ -392,7 +392,7 @@ class FieldController {
}
final List<FieldInfo> newFields = fieldInfos;
final Map<String, FieldIdPB> deletedFieldMap = {
for (final fieldOrder in deletedFields) fieldOrder.fieldId: fieldOrder
for (final fieldOrder in deletedFields) fieldOrder.fieldId: fieldOrder,
};
newFields.retainWhere((field) => (deletedFieldMap[field.id] == null));

2
frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_list.dart
View File

@ -100,7 +100,7 @@ class RowList {
final List<RowInfo> newRows = [];
final DeletedIndexs deletedIndex = [];
final Map<String, String> deletedRowByRowId = {
for (var rowId in rowIds) rowId: rowId
for (final rowId in rowIds) rowId: rowId,
};
_rowInfos.asMap().forEach((index, RowInfo rowInfo) {

9
frontend/appflowy_flutter/lib/plugins/database_view/application/tab_bar_bloc.dart
View File

@ -1,5 +1,5 @@
import 'package:appflowy/plugins/database_view/tab_bar/tab_bar_view.dart';
import 'package:appflowy/plugins/database_view/tab_bar/tab_bar_add_button.dart';
import 'package:appflowy/plugins/database_view/tab_bar/tab_bar_view.dart';
import 'package:appflowy/workspace/application/view/prelude.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy_backend/log.dart';
@ -65,7 +65,8 @@ class DatabaseTabBarBloc
if (updatePB.createChildViews.isNotEmpty) {
final allTabBars = [
...state.tabBars,
...updatePB.createChildViews.map((e) => DatabaseTabBar(view: e))
...updatePB.createChildViews
.map((e) => DatabaseTabBar(view: e)),
];
emit(
state.copyWith(
@ -80,7 +81,7 @@ class DatabaseTabBarBloc
if (updatePB.deleteChildViews.isNotEmpty) {
final allTabBars = [...state.tabBars];
final tabBarControllerByViewId = {
...state.tabBarControllerByViewId
...state.tabBarControllerByViewId,
};
var newSelectedIndex = state.selectedIndex;
for (final viewId in updatePB.deleteChildViews) {
@ -235,7 +236,7 @@ class DatabaseTabBarState with _$DatabaseTabBarState {
tabBarControllerByViewId: {
view.id: DatabaseTabBarController(
view: view,
)
),
},
);
}

2
frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/widgets/board_column_header.dart
View File

@ -237,7 +237,7 @@ class _BoardColumnHeaderState extends State<BoardColumnHeader> {
),
),
),
)
),
],
);
},

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

@ -431,7 +431,7 @@ class HiddenGroupPopupItemList extends StatelessWidget {
},
);
},
)
),
];
return ListView.separated(

2
frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart
View File

@ -283,7 +283,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
return;
}
fieldInfoByFieldId = {
for (var fieldInfo in fieldInfos) fieldInfo.field.id: fieldInfo
for (final fieldInfo in fieldInfos) fieldInfo.field.id: fieldInfo,
};
},
onRowsCreated: (rowIds) async {

2
frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_card.dart
View File

@ -230,7 +230,7 @@ class _EventCardState extends State<EventCard> {
color: Theme.of(context).hintColor,
overflow: TextOverflow.ellipsis,
),
)
),
],
),
),

2
frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart
View File

@ -435,7 +435,7 @@ class UnscheduleEventsList extends StatelessWidget {
PopoverContainer.of(context).close();
},
),
)
),
];
return ListView.separated(

2
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_option_editor.dart
View File

@ -50,7 +50,7 @@ class FieldTypeOptionEditor extends StatelessWidget {
final List<Widget> children = [
SwitchFieldButton(popoverMutex: popoverMutex),
if (typeOptionWidget != null) typeOptionWidget
if (typeOptionWidget != null) typeOptionWidget,
];
return ListView(

4
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/select_option.dart
View File

@ -48,7 +48,7 @@ class SelectOptionTypeOptionWidget extends StatelessWidget {
const VSpace(10),
if (state.options.isEmpty && !state.isEditingOption)
const _AddOptionButton(),
_OptionList(popoverMutex: popoverMutex)
_OptionList(popoverMutex: popoverMutex),
];
return ListView.builder(
@ -77,7 +77,7 @@ class OptionTitle extends StatelessWidget {
child: FlowyText.medium(
LocaleKeys.grid_field_optionTitle.tr(),
),
)
),
];
if (state.options.isNotEmpty && !state.isEditingOption) {
children.add(const Spacer());

2
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/shortcuts.dart
View File

@ -19,7 +19,7 @@ class GridShortcuts extends StatelessWidget {
}
Map<ShortcutActivator, Intent> bindKeys(List<LogicalKeyboardKey> keys) {
return {for (var key in keys) LogicalKeySet(key): KeyboardKeyIdent(key)};
return {for (final key in keys) LogicalKeySet(key): KeyboardKeyIdent(key)};
}
Map<Type, Action<Intent>> bindActions() {

2
frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/select_option_cell/extension.dart
View File

@ -123,7 +123,7 @@ class SelectOptionTag extends StatelessWidget {
FlowySvgs.close_s,
),
),
]
],
],
),
);

2
frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/text_cell/text_cell.dart
View File

@ -126,7 +126,7 @@ class _GridTextCellState extends GridEditableTextCell<GridTextCell> {
isDense: true,
),
),
)
),
],
),
),

8
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart
View File

@ -265,13 +265,17 @@ class _AppFlowyEditorPageState extends State<AppFlowyEditorPage> {
child: MobileFloatingToolbar(
editorState: editorState,
editorScrollController: editorScrollController,
toolbarBuilder: (context, anchor) {
toolbarBuilder: (context, anchor, closeToolbar) {
return AdaptiveTextSelectionToolbar.editable(
clipboardStatus: ClipboardStatus.pasteable,
onCopy: () => copyCommand.execute(editorState),
onCopy: () {
copyCommand.execute(editorState);
closeToolbar();
},
onCut: () => cutCommand.execute(editorState),
onPaste: () => pasteCommand.execute(editorState),
onSelectAll: () => selectAllCommand.execute(editorState),
onLiveTextInput: null,
anchors: TextSelectionToolbarAnchors(
primaryAnchor: anchor,
),

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/block_action_option_button.dart
View File

@ -79,7 +79,7 @@ class BlockOptionButton extends StatelessWidget {
),
TextSpan(
text: LocaleKeys.document_plugins_optionAction_toOpenMenu.tr(),
)
),
],
),
onTap: () {

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart
View File

@ -170,7 +170,7 @@ class _BuiltInPageWidgetState extends State<BuiltInPageWidget> {
}
controller.close();
},
)
),
],
);
}

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/insert_page_command.dart
View File

@ -84,7 +84,7 @@ extension InsertDatabase on EditorState {
MentionBlockKeys.mention: {
MentionBlockKeys.type: MentionType.page.name,
MentionBlockKeys.pageId: view.id,
}
},
},
);
}

18
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/link_to_page_widget.dart
View File

@ -44,13 +44,15 @@ void showLinkToPageMenu(
await editorState.insertReferencePage(viewPB, pageType);
linkToPageMenuEntry.remove();
} on FlowyError catch (e) {
Dialogs.show(
child: FlowyErrorPage.message(
e.msg,
howToFix: LocaleKeys.errorDialog_howToFixFallback.tr(),
),
context,
);
if (context.mounted) {
Dialogs.show(
child: FlowyErrorPage.message(
e.msg,
howToFix: LocaleKeys.errorDialog_howToFixFallback.tr(),
),
context,
);
}
}
},
),
@ -149,7 +151,7 @@ class _LinkToPageMenuState extends State<LinkToPageMenu> {
LogicalKeyboardKey.arrowUp,
LogicalKeyboardKey.arrowDown,
LogicalKeyboardKey.tab,
LogicalKeyboardKey.enter
LogicalKeyboardKey.enter,
];
if (!acceptedKeys.contains(event.logicalKey)) {

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/copy_and_paste/editor_state_paste_node_extension.dart
View File

@ -119,7 +119,7 @@ extension PasteNodes on EditorState {
if (nodes.last.children.isNotEmpty) {
return [
...path,
...calculatePath([0], nodes.last.children.toList())
...calculatePath([0], nodes.last.children.toList()),
];
}
return path;

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/cover_editor.dart
View File

@ -19,7 +19,7 @@ const String kLocalImagesKey = 'local_images';
List<String> get builtInAssetImages => [
"assets/images/app_flowy_abstract_cover_1.jpg",
"assets/images/app_flowy_abstract_cover_2.jpg"
"assets/images/app_flowy_abstract_cover_2.jpg",
];
class ChangeCoverPopover extends StatefulWidget {

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/cover_editor_bloc.dart
View File

@ -102,7 +102,7 @@ class ChangeCoverPopoverBloc
transaction.updateNode(node, {
DocumentHeaderBlockKeys.coverType: CoverType.none.toString(),
DocumentHeaderBlockKeys.icon:
node.attributes[DocumentHeaderBlockKeys.icon]
node.attributes[DocumentHeaderBlockKeys.icon],
});
return editorState.apply(transaction);
}

4
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/custom_cover_picker.dart
View File

@ -148,7 +148,7 @@ class _NetworkImageUrlInputState extends State<NetworkImageUrlInput> {
title: LocaleKeys.document_plugins_cover_add.tr(),
borderRadius: Corners.s8Border,
),
)
),
],
);
}
@ -322,7 +322,7 @@ class _CoverImagePreviewWidgetState extends State<CoverImagePreviewWidget> {
(l) => _buildImageDeleteButton(context),
(r) => Container(),
)
: Container()
: Container(),
],
);
}

4
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart
View File

@ -173,7 +173,7 @@ class _DocumentHeaderNodeWidgetState extends State<DocumentHeaderNodeWidget> {
DocumentHeaderBlockKeys.coverDetails:
widget.node.attributes[DocumentHeaderBlockKeys.coverDetails],
DocumentHeaderBlockKeys.icon:
widget.node.attributes[DocumentHeaderBlockKeys.icon]
widget.node.attributes[DocumentHeaderBlockKeys.icon],
};
if (cover != null) {
attributes[DocumentHeaderBlockKeys.coverType] = cover.$1.toString();
@ -398,7 +398,7 @@ class DocumentCoverState extends State<DocumentCover> {
width: double.infinity,
child: _buildCoverImage(),
),
if (!isOverlayButtonsHidden) _buildCoverOverlayButtons(context)
if (!isOverlayButtonsHidden) _buildCoverOverlayButtons(context),
],
),
),

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/open_ai_image_widget.dart
View File

@ -88,7 +88,7 @@ class _OpenAIImageWidgetState extends State<OpenAIImageWidget> {
);
},
),
)
),
],
);
}

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/stability_ai_image_widget.dart
View File

@ -104,7 +104,7 @@ class _StabilityAIImageWidgetState extends State<StabilityAIImageWidget> {
);
},
),
)
),
],
);
}

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/slash_menu_items.dart
View File

@ -37,7 +37,7 @@ Future<void> _insertDateReference(EditorState editorState) async {
MentionBlockKeys.mention: {
MentionBlockKeys.type: MentionType.date.name,
MentionBlockKeys.date: DateTime.now().toIso8601String(),
}
},
},
);

4
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/auto_completion_node_widget.dart
View File

@ -157,7 +157,7 @@ class _AutoCompletionBlockComponentState
onKeep: _onExit,
onRewrite: _onRewrite,
onDiscard: _onDiscard,
)
),
],
],
),
@ -477,7 +477,7 @@ class AutoCompletionHeader extends StatelessWidget {
onTap: () async {
await openLearnMorePage();
},
)
),
],
);
}

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart
View File

@ -18,7 +18,7 @@ class Loading {
children: [
Center(
child: CircularProgressIndicator(),
)
),
],
);
},

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_node_widget.dart
View File

@ -254,7 +254,7 @@ class _SmartEditInputWidgetState extends State<SmartEditInputWidget> {
onTap: () async {
await openLearnMorePage();
},
)
),
],
);
}

2
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart
View File

@ -132,7 +132,7 @@ class EditorStyleCustomizer {
fontSize + 8,
fontSize + 4,
fontSize + 2,
fontSize
fontSize,
];
return TextStyle(
fontSize: fontSizes.elementAtOrNull(level - 1) ?? fontSize,

2
frontend/appflowy_flutter/lib/plugins/document/presentation/export_page_widget.dart
View File

@ -31,7 +31,7 @@ class ExportPageWidget extends StatelessWidget {
width: 100,
height: 30,
onPressed: onTap,
)
),
],
);
}

2
frontend/appflowy_flutter/lib/plugins/document/presentation/more/more_button.dart
View File

@ -35,7 +35,7 @@ class DocumentMoreButton extends StatelessWidget {
BlocProvider.value(
value: context.read<DocumentAppearanceCubit>(),
child: const FontSizeSwitcher(),
)
),
],
),
);

2
frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/date_reference.dart
View File

@ -124,7 +124,7 @@ class DateReferenceService {
MentionBlockKeys.mention: {
MentionBlockKeys.type: MentionType.date.name,
MentionBlockKeys.date: date.toIso8601String(),
}
},
},
);

2
frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart
View File

@ -109,7 +109,7 @@ class InlinePageReferenceService {
MentionBlockKeys.mention: {
MentionBlockKeys.type: MentionType.page.name,
MentionBlockKeys.pageId: view.id,
}
},
},
);

2
frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/reminder_reference.dart
View File

@ -150,7 +150,7 @@ class ReminderReferenceService {
MentionBlockKeys.type: MentionType.reminder.name,
MentionBlockKeys.date: date.toIso8601String(),
MentionBlockKeys.uid: reminder.id,
}
},
},
);

2
frontend/appflowy_flutter/lib/plugins/inline_actions/widgets/inline_actions_handler.dart
View File

@ -226,7 +226,7 @@ class _InlineActionsHandlerState extends State<InlineActionsHandler> {
![
...moveKeys,
LogicalKeyboardKey.arrowLeft,
LogicalKeyboardKey.arrowRight
LogicalKeyboardKey.arrowRight,
].contains(event.logicalKey)) {
/// Prevents dismissal of context menu by notifying the parent
/// that the selection change occurred from the handler.

2
frontend/appflowy_flutter/lib/plugins/trash/trash_page.dart
View File

@ -110,7 +110,7 @@ class _TrashPageState extends State<TrashPage> {
onTap: () =>
context.read<TrashBloc>().add(const TrashEvent.deleteAll()),
),
)
),
],
),
);

2
frontend/appflowy_flutter/lib/startup/startup.dart
View File

@ -75,7 +75,7 @@ class FlowyRunner {
InitSupabaseTask(),
InitAppFlowyCloudTask(),
const InitAppWidgetTask(),
const InitPlatformServiceTask()
const InitPlatformServiceTask(),
],
],
);

2
frontend/appflowy_flutter/lib/user/application/auth/af_cloud_auth_service.dart
View File

@ -100,7 +100,7 @@ class AFCloudAuthService implements AuthService {
authType: AuthTypePB.AFCloud,
map: {
AuthServiceMapKeys.signInURL: uri.toString(),
AuthServiceMapKeys.deviceId: deviceId
AuthServiceMapKeys.deviceId: deviceId,
},
);
final result = await UserEventOauthSignIn(payload)

4
frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart
View File

@ -97,7 +97,7 @@ class SupabaseAuthService implements AuthService {
map: {
AuthServiceMapKeys.uuid: userId,
AuthServiceMapKeys.email: userEmail,
AuthServiceMapKeys.deviceId: await getDeviceId()
AuthServiceMapKeys.deviceId: await getDeviceId(),
},
);
},
@ -140,7 +140,7 @@ class SupabaseAuthService implements AuthService {
map: {
AuthServiceMapKeys.uuid: userId,
AuthServiceMapKeys.email: userEmail,
AuthServiceMapKeys.deviceId: await getDeviceId()
AuthServiceMapKeys.deviceId: await getDeviceId(),
},
);
},

2
frontend/appflowy_flutter/lib/user/application/auth/supabase_mock_auth_service.dart
View File

@ -61,7 +61,7 @@ class MockAuthService implements AuthService {
map: {
AuthServiceMapKeys.uuid: uuid,
AuthServiceMapKeys.email: email,
AuthServiceMapKeys.deviceId: 'MockDeviceId'
AuthServiceMapKeys.deviceId: 'MockDeviceId',
},
);

2
frontend/appflowy_flutter/lib/user/presentation/historical_user.dart
View File

@ -48,7 +48,7 @@ class HistoricalUserList extends StatelessWidget {
},
itemCount: state.historicalUsers.length,
),
)
),
],
);
}

2
frontend/appflowy_flutter/lib/user/presentation/screens/sign_up_screen.dart
View File

@ -81,7 +81,7 @@ class SignUpForm extends StatelessWidget {
if (context.read<SignUpBloc>().state.isSubmitting) ...[
const SizedBox(height: 8),
const LinearProgressIndicator(value: null),
]
],
],
),
);

2
frontend/appflowy_flutter/lib/user/presentation/screens/workspace_error_screen.dart
View File

@ -129,7 +129,7 @@ class WorkspaceErrorDescription extends StatelessWidget {
"Error code: ${state.initialError.code.value.toString()}",
fontSize: 12,
maxLines: 1,
)
),
],
);
},

2
frontend/appflowy_flutter/lib/user/presentation/widgets/folder_widget.dart
View File

@ -185,7 +185,7 @@ class CreateFolderWidgetState extends State<CreateFolderWidget> {
}
},
),
)
),
],
);
}

2
frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/favorite_folder.dart
View File

@ -63,7 +63,7 @@ class FavoriteFolder extends StatelessWidget {
onTertiarySelected: (view) =>
context.read<TabsBloc>().openTab(view),
),
)
),
],
);
},

4
frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/personal_folder.dart
View File

@ -62,7 +62,7 @@ class PersonalFolder extends StatelessWidget {
onTertiarySelected: (view) =>
context.read<TabsBloc>().openTab(view),
),
)
),
],
);
},
@ -136,7 +136,7 @@ class _PersonalFolderHeaderState extends State<PersonalFolderHeader> {
);
},
),
]
],
],
),
);

2
frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart
View File

@ -51,7 +51,7 @@ class HomeSideBar extends StatelessWidget {
),
BlocProvider(
create: (_) => FavoriteBloc()..add(const FavoriteEvent.initial()),
)
),
],
child: MultiBlocListener(
listeners: [

2
frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
View File

@ -324,7 +324,7 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
widget.view.name,
overflow: TextOverflow.ellipsis,
),
)
),
];
// hover action

2
frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
View File

@ -76,7 +76,7 @@ class SettingsDialog extends StatelessWidget {
context.read<SettingsDialogBloc>().state.page,
context.read<SettingsDialogBloc>().state.userProfile,
),
)
),
],
),
),

32
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/emoji_picker/src/emoji_lists.dart
View File

@ -373,7 +373,7 @@ final Map<String, String> smileys = Map.fromIterables([
'Rescue Worker’s Helmet',
'Lipstick',
'Ring',
'Briefcase'
'Briefcase',
], [
'😀',
'😃',
@ -734,7 +734,7 @@ final Map<String, String> smileys = Map.fromIterables([
'⛑',
'💄',
'💍',
'💼'
'💼',
]);
/// Map of all possible emojis along with their names in [Category.ANIMALS]
@ -919,7 +919,7 @@ final Map<String, String> animals = Map.fromIterables([
'Christmas Tree',
'Sparkles',
'Tanabata Tree',
'Pine Decoration'
'Pine Decoration',
], [
'🐶',
'🐱',
@ -1101,7 +1101,7 @@ final Map<String, String> animals = Map.fromIterables([
'🎄',
'✨',
'🎋',
'🎍'
'🎍',
]);
/// Map of all possible emojis along with their names in [Category.FOODS]
@ -1210,7 +1210,7 @@ final Map<String, String> foods = Map.fromIterables([
'Chopsticks',
'Fork and Knife With Plate',
'Fork and Knife',
'Spoon'
'Spoon',
], [
'🍇',
'🍈',
@ -1316,7 +1316,7 @@ final Map<String, String> foods = Map.fromIterables([
'🥢',
'🍽',
'🍴',
'🥄'
'🥄',
]);
/// Map of all possible emojis along with their names in [Category.TRAVEL]
@ -1445,7 +1445,7 @@ final Map<String, String> travel = Map.fromIterables([
'Passport Control',
'Customs',
'Baggage Claim',
'Left Luggage'
'Left Luggage',
], [
'🚣',
'🗾',
@ -1571,7 +1571,7 @@ final Map<String, String> travel = Map.fromIterables([
'🛂',
'🛃',
'🛄',
'🛅'
'🛅',
]);
/// Map of all possible emojis along with their names in [Category.ACTIVITIES]
@ -1667,7 +1667,7 @@ final Map<String, String> activities = Map.fromIterables([
'Violin',
'Drum',
'Clapper Board',
'Bow and Arrow'
'Bow and Arrow',
], [
'🕴',
'🧗',
@ -1760,7 +1760,7 @@ final Map<String, String> activities = Map.fromIterables([
'🎻',
'🥁',
'🎬',
'🏹'
'🏹',
]);
/// Map of all possible emojis along with their names in [Category.OBJECTS]
@ -1962,7 +1962,7 @@ final Map<String, String> objects = Map.fromIterables([
'Coffin',
'Funeral Urn',
'Moai',
'Potable Water'
'Potable Water',
], [
'💌',
'🕳',
@ -2161,7 +2161,7 @@ final Map<String, String> objects = Map.fromIterables([
'⚰',
'⚱',
'🗿',
'🚰'
'🚰',
]);
/// Map of all possible emojis along with their names in [Category.SYMBOLS]
@ -2424,7 +2424,7 @@ final Map<String, String> symbols = Map.fromIterables([
'Red Triangle Pointed Down',
'Diamond With a Dot',
'White Square Button',
'Black Square Button'
'Black Square Button',
], [
'💘',
'💝',
@ -2684,7 +2684,7 @@ final Map<String, String> symbols = Map.fromIterables([
'🔻',
'💠',
'🔳',
'🔲'
'🔲',
]);
/// Map of all possible emojis along with their names in [Category.FLAGS]
@ -2953,7 +2953,7 @@ final Map<String, String> flags = Map.fromIterables([
'Flag: Mayotte',
'Flag: South Africa',
'Flag: Zambia',
'Flag: Zimbabwe'
'Flag: Zimbabwe',
], [
'🏁',
'🚩',
@ -3219,5 +3219,5 @@ final Map<String, String> flags = Map.fromIterables([
'🇾🇹',
'🇿🇦',
'🇿🇲',
'🇿🇼'
'🇿🇼',
]);

2
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/emoji_picker/src/emoji_picker.dart
View File

@ -226,7 +226,7 @@ class EmojiPickerState extends State<EmojiPicker> {
EmojiCategoryGroup(
EmojiCategory.FLAGS,
await _getAvailableEmojis(emoji_list.flags, title: 'flags'),
)
),
]);
}

2
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dart
View File

@ -49,7 +49,7 @@ class SettingThirdPartyLogin extends StatelessWidget {
fontSize: 16,
),
const HSpace(6),
indicator
indicator,
],
),
const VSpace(6),

4
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_appearance/color_scheme.dart
View File

@ -122,7 +122,7 @@ class ColorSchemeUploadPopover extends StatelessWidget {
false,
),
)
.toList()
.toList(),
],
],
),
@ -168,7 +168,7 @@ class ColorSchemeUploadPopover extends StatelessWidget {
width: 20,
onPressed: () =>
bloc.add(DynamicPluginEvent.removePlugin(name: theme)),
)
),
],
),
);

4
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_appearance/direction_setting.dart
View File

@ -34,7 +34,7 @@ class LayoutDirectionSetting extends StatelessWidget {
_layoutDirectionItemButton(context, LayoutDirection.rtlLayout),
],
),
)
),
],
);
}
@ -98,7 +98,7 @@ class TextDirectionSetting extends StatelessWidget {
_textDirectionItemButton(context, AppFlowyTextDirection.auto),
],
),
)
),
],
);

2
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_appearance/font_family_setting.dart
View File

@ -45,7 +45,7 @@ class _ThemeFontFamilySettingState extends State<ThemeFontFamilySetting> {
trailing: [
FontFamilyDropDown(
currentFontFamily: widget.currentFontFamily,
)
),
],
);
}

4
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_customize_shortcuts_view.dart
View File

@ -127,12 +127,12 @@ class ShortcutsListTile extends StatelessWidget {
onPressed: () {
showKeyListenerDialog(context);
},
)
),
],
),
Divider(
color: Theme.of(context).dividerColor,
)
),
],
);
}

17
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart
View File

@ -2,18 +2,19 @@ import 'dart:io';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/startup/entry_point.dart';
import 'package:flowy_infra/file_picker/file_picker_service.dart';
import 'package:appflowy/workspace/application/settings/settings_location_cubit.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/file_picker/file_picker_service.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flowy_infra_ui/widget/buttons/secondary_button.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';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:styled_widget/styled_widget.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../../generated/locale_keys.g.dart';
import '../../../../startup/launch_configuration.dart';
import '../../../../startup/startup.dart';
@ -172,7 +173,10 @@ class _ChangeStoragePathButtonState extends State<_ChangeStoragePathButton> {
onPressed: () async {
// pick the new directory and reload app
final path = await getIt<FilePickerService>().getDirectoryPath();
if (path == null || !mounted || widget.usingPath == path) {
if (path == null || widget.usingPath == path) {
return;
}
if (!mounted) {
return;
}
await context.read<SettingsLocationCubit>().setCustomPath(path);
@ -245,7 +249,10 @@ class _RecoverDefaultStorageButtonState
// reset to the default directory and reload app
final directory = await appFlowyApplicationDataDirectory();
final path = directory.path;
if (!mounted || widget.usingPath == path) {
if (widget.usingPath == path) {
return;
}
if (!mounted) {
return;
}
await context

41
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dart
View File

@ -2,21 +2,22 @@ import 'dart:io';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/export/document_exporter.dart';
import 'package:appflowy/workspace/presentation/home/toast.dart';
import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:flowy_infra/file_picker/file_picker_service.dart';
import 'package:appflowy/workspace/application/settings/settings_file_exporter_cubit.dart';
import 'package:appflowy/workspace/application/settings/share/export_service.dart';
import 'package:appflowy/workspace/presentation/home/toast.dart';
import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';
import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';
import 'package:dartz/dartz.dart' as dartz;
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/file_picker/file_picker_service.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart' hide WidgetBuilder;
import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';
import 'package:appflowy_backend/protobuf/flowy-folder2/workspace.pb.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:path/path.dart' as p;
import '../../../../generated/locale_keys.g.dart';
class FileExporterWidget extends StatefulWidget {
@ -69,13 +70,13 @@ class _FileExporterWidgetState extends State<FileExporterWidget> {
.selectOrDeselectAllItems();
},
),
)
),
],
),
const VSpace(8),
const Expanded(child: _ExpandedList()),
const VSpace(8),
_buildButtons()
_buildButtons(),
],
),
);
@ -107,18 +108,20 @@ class _FileExporterWidgetState extends State<FileExporterWidget> {
final views = cubit!.state.selectedViews;
final result =
await _AppFlowyFileExporter.exportToPath(exportPath, views);
if (result.$1 && mounted) {
// success
showSnackBarMessage(
context,
LocaleKeys.settings_files_exportFileSuccess.tr(),
);
} else {
showSnackBarMessage(
context,
LocaleKeys.settings_files_exportFileFail.tr() +
result.$2.join('\n'),
);
if (mounted) {
if (result.$1) {
// success
showSnackBarMessage(
context,
LocaleKeys.settings_files_exportFileSuccess.tr(),
);
} else {
showSnackBarMessage(
context,
LocaleKeys.settings_files_exportFileFail.tr() +
result.$2.join('\n'),
);
}
}
} else {
showSnackBarMessage(

2
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_system_view.dart
View File

@ -16,7 +16,7 @@ class _SettingsFileSystemViewState extends State<SettingsFileSystemView> {
late final _items = [
const SettingsFileLocationCustomizer(),
// disable export data for v0.2.0 in release mode.
if (kDebugMode) const SettingsExportFileWidget()
if (kDebugMode) const SettingsExportFileWidget(),
];
@override

2
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_notifications_view.dart
View File

@ -33,7 +33,7 @@ class SettingsNotificationsView extends StatelessWidget {
.read<NotificationSettingsCubit>()
.toggleNotificationsEnabled();
},
)
),
],
),
],

2
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dart
View File

@ -56,7 +56,7 @@ class SettingsUserView extends StatelessWidget {
_buildUserIconSetting(context),
if (isCloudEnabled && user.authType != AuthTypePB.Local) ...[
const VSpace(12),
UserEmailInput(user.email)
UserEmailInput(user.email),
],
const VSpace(12),
_renderCurrentOpenaiKey(context),

6
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/sync_setting_view.dart
View File

@ -87,7 +87,7 @@ class EnableEncrypt extends StatelessWidget {
.add(CloudSettingEvent.enableEncrypt(value));
},
value: state.config.enableEncrypt,
)
),
],
),
Column(
@ -128,7 +128,7 @@ class EnableEncrypt extends StatelessWidget {
),
),
],
)
),
],
);
},
@ -154,7 +154,7 @@ class EnableSync extends StatelessWidget {
);
},
value: state.config.enableSync,
)
),
],
);
},

8
frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialogs.dart
View File

@ -88,7 +88,7 @@ class _NavigatorTextFieldDialogState extends State<NavigatorTextFieldDialog> {
}
Navigator.of(context).pop();
},
)
),
],
),
);
@ -149,8 +149,8 @@ class _CreateFlowyAlertDialog extends State<NavigatorAlertDialog> {
widget.cancel?.call();
Navigator.of(context).pop();
},
)
]
),
],
],
),
);
@ -209,7 +209,7 @@ class NavigatorOkCancelDialog extends StatelessWidget {
},
okTitle: okTitle?.toUpperCase(),
cancelTitle: cancelTitle?.toUpperCase(),
)
),
],
),
);

Some files were not shown because too many files have changed in this diff Show More