Skip to content

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

chore: reorganize code (#7206)

Richard Shiuef73c2540c6f0
diff --git a/frontend/appflowy_flutter/integration_test/shared/mock/mock_openai_repository.dart b/frontend/appflowy_flutter/integration_test/shared/mock/mock_openai_repository.dart
index 062a520f2a..ec1891dea8 100644
--- a/frontend/appflowy_flutter/integration_test/shared/mock/mock_openai_repository.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/mock/mock_openai_repository.dart
@@ -1,9 +1,9 @@
import 'dart:async';
import 'dart:convert';
-import 'package:appflowy/ai/error.dart';
-import 'package:appflowy/ai/openai_client.dart';
-import 'package:appflowy/ai/text_completion.dart';
+import 'package:appflowy/ai/service/error.dart';
+import 'package:appflowy/ai/service/openai_client.dart';
+import 'package:appflowy/ai/service/text_completion.dart';
import 'package:http/http.dart' as http;
import 'package:mocktail/mocktail.dart';
diff --git a/frontend/appflowy_flutter/lib/ai/ai.dart b/frontend/appflowy_flutter/lib/ai/ai.dart
new file mode 100644
index 0000000000..a6fa49ef68
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/ai/ai.dart
@@ -0,0 +1,12 @@
+export 'widgets/loading_indicator.dart';
+export 'widgets/prompt_input/action_buttons.dart';
+export 'widgets/prompt_input/desktop_input_text_field.dart';
+export 'widgets/prompt_input/file_attachment_list.dart';
+export 'widgets/prompt_input/layout_define.dart';
+export 'widgets/prompt_input/mention_page_bottom_sheet.dart';
+export 'widgets/prompt_input/mention_page_menu.dart';
+export 'widgets/prompt_input/mentioned_page_text_span.dart';
+export 'widgets/prompt_input/predefined_format_buttons.dart';
+export 'widgets/prompt_input/select_sources_bottom_sheet.dart';
+export 'widgets/prompt_input/select_sources_menu.dart';
+export 'widgets/prompt_input/send_button.dart';
diff --git a/frontend/appflowy_flutter/lib/ai/ai_client.dart b/frontend/appflowy_flutter/lib/ai/service/ai_client.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/ai/ai_client.dart
rename to frontend/appflowy_flutter/lib/ai/service/ai_client.dart
diff --git a/frontend/appflowy_flutter/lib/ai/appflowy_ai_service.dart b/frontend/appflowy_flutter/lib/ai/service/appflowy_ai_service.dart
similarity index 78%
rename from frontend/appflowy_flutter/lib/ai/appflowy_ai_service.dart
rename to frontend/appflowy_flutter/lib/ai/service/appflowy_ai_service.dart
index 2066a489c8..04ec2aaece 100644
--- a/frontend/appflowy_flutter/lib/ai/appflowy_ai_service.dart
+++ b/frontend/appflowy_flutter/lib/ai/service/appflowy_ai_service.dart
@@ -3,7 +3,6 @@ import 'dart:ffi';
import 'dart:isolate';
import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart';
import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:appflowy_backend/protobuf/flowy-ai/entities.pb.dart';
import 'package:appflowy_result/appflowy_result.dart';
@@ -14,6 +13,41 @@ import 'ai_client.dart';
import 'error.dart';
import 'text_completion.dart';
+enum AskAIAction {
+ summarize,
+ fixSpelling,
+ improveWriting,
+ makeItLonger;
+
+ String get toInstruction => switch (this) {
+ summarize => 'Tl;dr',
+ fixSpelling => 'Correct this to standard English:',
+ improveWriting => 'Rewrite this in your own words:',
+ makeItLonger => 'Make this text longer:',
+ };
+
+ String prompt(String input) => switch (this) {
+ summarize => '$input\n\n$toInstruction',
+ _ => "$toInstruction\n\n$input",
+ };
+
+ static AskAIAction from(int index) => switch (index) {
+ 0 => summarize,
+ 1 => fixSpelling,
+ 2 => improveWriting,
+ 3 => makeItLonger,
+ _ => fixSpelling
+ };
+
+ String get name => switch (this) {
+ summarize => LocaleKeys.document_plugins_smartEditSummarize.tr(),
+ fixSpelling => LocaleKeys.document_plugins_smartEditFixSpelling.tr(),
+ improveWriting =>
+ LocaleKeys.document_plugins_smartEditImproveWriting.tr(),
+ makeItLonger => LocaleKeys.document_plugins_smartEditMakeLonger.tr(),
+ };
+}
+
class AppFlowyAIService implements AIRepository {
@override
Future<FlowyResult<List<String>, AIError>> generateImage({
diff --git a/frontend/appflowy_flutter/lib/ai/error.dart b/frontend/appflowy_flutter/lib/ai/service/error.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/ai/error.dart
rename to frontend/appflowy_flutter/lib/ai/service/error.dart
diff --git a/frontend/appflowy_flutter/lib/ai/openai_client.dart b/frontend/appflowy_flutter/lib/ai/service/openai_client.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/ai/openai_client.dart
rename to frontend/appflowy_flutter/lib/ai/service/openai_client.dart
diff --git a/frontend/appflowy_flutter/lib/ai/text_completion.dart b/frontend/appflowy_flutter/lib/ai/service/text_completion.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/ai/text_completion.dart
rename to frontend/appflowy_flutter/lib/ai/service/text_completion.dart
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/loading_indicator.dart b/frontend/appflowy_flutter/lib/ai/widgets/loading_indicator.dart
similarity index 96%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/loading_indicator.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/loading_indicator.dart
index be7bbf7ac9..f1c5cf0cfb 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/loading_indicator.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/loading_indicator.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart';
/// An animated generating indicator for an AI response
-class ChatAILoading extends StatelessWidget {
- const ChatAILoading({
+class AILoadingIndicator extends StatelessWidget {
+ const AILoadingIndicator({
super.key,
this.text = "",
this.duration = const Duration(seconds: 1),
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/ai_prompt_buttons.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/action_buttons.dart
similarity index 54%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/ai_prompt_buttons.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/action_buttons.dart
index 7d0fc10e3f..9dd370b39b 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/ai_prompt_buttons.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/action_buttons.dart
@@ -6,9 +6,7 @@ import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/style_widget/icon_button.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
-import '../layout_define.dart';
-
-enum SendButtonState { enabled, streaming, disabled }
+import 'layout_define.dart';
class PromptInputAttachmentButton extends StatelessWidget {
const PromptInputAttachmentButton({required this.onTap, super.key});
@@ -67,57 +65,3 @@ class PromptInputMentionButton extends StatelessWidget {
);
}
}
-
-class PromptInputSendButton extends StatelessWidget {
- const PromptInputSendButton({
- super.key,
- required this.buttonSize,
- required this.iconSize,
- required this.state,
- required this.onSendPressed,
- required this.onStopStreaming,
- });
-
- final double buttonSize;
- final double iconSize;
- final SendButtonState state;
- final VoidCallback onSendPressed;
- final VoidCallback onStopStreaming;
-
- @override
- Widget build(BuildContext context) {
- return FlowyIconButton(
- width: buttonSize,
- icon: switch (state) {
- SendButtonState.enabled => FlowySvg(
- FlowySvgs.ai_send_filled_s,
- size: Size.square(iconSize),
- color: Theme.of(context).colorScheme.primary,
- ),
- SendButtonState.disabled => FlowySvg(
- FlowySvgs.ai_send_filled_s,
- size: Size.square(iconSize),
- color: Theme.of(context).disabledColor,
- ),
- SendButtonState.streaming => FlowySvg(
- FlowySvgs.ai_stop_filled_s,
- size: Size.square(iconSize),
- color: Theme.of(context).colorScheme.primary,
- ),
- },
- onPressed: () {
- switch (state) {
- case SendButtonState.enabled:
- onSendPressed();
- break;
- case SendButtonState.streaming:
- onStopStreaming();
- break;
- case SendButtonState.disabled:
- break;
- }
- },
- hoverColor: Colors.transparent,
- );
- }
-}
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/desktop_input_text_field.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/desktop_input_text_field.dart
new file mode 100644
index 0000000000..ed95da1509
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/desktop_input_text_field.dart
@@ -0,0 +1,53 @@
+import 'package:appflowy/plugins/ai_chat/application/chat_input_control_cubit.dart';
+import 'package:appflowy/plugins/ai_chat/presentation/layout_define.dart';
+import 'package:extended_text_field/extended_text_field.dart';
+import 'package:flutter/material.dart';
+
+import 'mentioned_page_text_span.dart';
+
+class PromptInputTextField extends StatelessWidget {
+ const PromptInputTextField({
+ super.key,
+ required this.cubit,
+ required this.textController,
+ required this.textFieldFocusNode,
+ required this.contentPadding,
+ this.hintText = "",
+ });
+
+ final ChatInputControlCubit cubit;
+ final TextEditingController textController;
+ final FocusNode textFieldFocusNode;
+ final EdgeInsetsGeometry contentPadding;
+ final String hintText;
+
+ @override
+ Widget build(BuildContext context) {
+ return ExtendedTextField(
+ controller: textController,
+ focusNode: textFieldFocusNode,
+ decoration: InputDecoration(
+ border: InputBorder.none,
+ enabledBorder: InputBorder.none,
+ focusedBorder: InputBorder.none,
+ contentPadding: contentPadding,
+ hintText: hintText,
+ hintStyle: AIChatUILayout.inputHintTextStyle(context),
+ isCollapsed: true,
+ isDense: true,
+ ),
+ keyboardType: TextInputType.multiline,
+ textCapitalization: TextCapitalization.sentences,
+ minLines: 1,
+ maxLines: null,
+ style: Theme.of(context).textTheme.bodyMedium,
+ specialTextSpanBuilder: PromptInputTextSpanBuilder(
+ inputControlCubit: cubit,
+ specialTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
+ color: Theme.of(context).colorScheme.primary,
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input_file.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/file_attachment_list.dart
similarity index 98%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input_file.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/file_attachment_list.dart
index d2f6f6750e..fddde4dc69 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input_file.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/file_attachment_list.dart
@@ -8,10 +8,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:styled_widget/styled_widget.dart';
-import '../layout_define.dart';
+import 'layout_define.dart';
-class ChatInputFile extends StatelessWidget {
- const ChatInputFile({
+class PromptInputFile extends StatelessWidget {
+ const PromptInputFile({
super.key,
required this.chatId,
required this.onDeleted,
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/layout_define.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/layout_define.dart
new file mode 100644
index 0000000000..e5c7e54522
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/layout_define.dart
@@ -0,0 +1,42 @@
+import 'package:flutter/widgets.dart';
+
+class DesktopAIPromptSizes {
+ const DesktopAIPromptSizes._();
+
+ static const attachedFilesBarPadding =
+ EdgeInsets.only(left: 8.0, top: 8.0, right: 8.0);
+ static const attachedFilesPreviewHeight = 48.0;
+ static const attachedFilesPreviewSpacing = 12.0;
+
+ static const predefinedFormatButtonHeight = 28.0;
+ static const predefinedFormatIconHeight = 16.0;
+
+ static const textFieldMinHeight = 36.0;
+ static const textFieldContentPadding =
+ EdgeInsetsDirectional.fromSTEB(14.0, 8.0, 14.0, 8.0);
+
+ static const actionBarButtonSize = 28.0;
+ static const actionBarIconSize = 16.0;
+ static const actionBarSendButtonSize = 32.0;
+ static const actionBarSendButtonIconSize = 24.0;
+}
+
+class MobileAIPromptSizes {
+ const MobileAIPromptSizes._();
+
+ static const attachedFilesBarHeight = 68.0;
+ static const attachedFilesBarPadding =
+ EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0, bottom: 4.0);
+ static const attachedFilesPreviewHeight = 56.0;
+ static const attachedFilesPreviewSpacing = 8.0;
+
+ static const predefinedFormatButtonHeight = 32.0;
+ static const predefinedFormatIconHeight = 20.0;
+
+ static const textFieldMinHeight = 32.0;
+ static const textFieldContentPadding =
+ EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0);
+
+ static const mentionIconSize = 20.0;
+ static const sendButtonSize = 32.0;
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_bottom_sheet.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mention_page_bottom_sheet.dart
similarity index 99%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_bottom_sheet.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mention_page_bottom_sheet.dart
index cb2e7248d4..6e17f311f3 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_bottom_sheet.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mention_page_bottom_sheet.dart
@@ -8,7 +8,7 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
-import 'chat_mention_page_menu.dart';
+import 'mention_page_menu.dart';
Future<ViewPB?> showPageSelectorSheet(
BuildContext context, {
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_menu.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mention_page_menu.dart
similarity index 94%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_menu.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mention_page_menu.dart
index 0a5d32838f..69fecad613 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_menu.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mention_page_menu.dart
@@ -19,30 +19,32 @@ const double _noPageHeight = 20.0;
const double _fixedWidth = 360.0;
const double _maxHeight = 328.0;
-class ChatInputAnchor {
- ChatInputAnchor(this.anchorKey, this.layerLink);
+class PromptInputAnchor {
+ PromptInputAnchor(this.anchorKey, this.layerLink);
final GlobalKey<State<StatefulWidget>> anchorKey;
final LayerLink layerLink;
}
-class ChatMentionPageMenu extends StatefulWidget {
- const ChatMentionPageMenu({
+class PromptInputMentionPageMenu extends StatefulWidget {
+ const PromptInputMentionPageMenu({
super.key,
required this.anchor,
required this.textController,
required this.onPageSelected,
});
- final ChatInputAnchor anchor;
+ final PromptInputAnchor anchor;
final TextEditingController textController;
final void Function(ViewPB view) onPageSelected;
@override
- State<ChatMentionPageMenu> createState() => _ChatMentionPageMenuState();
+ State<PromptInputMentionPageMenu> createState() =>
+ _PromptInputMentionPageMenuState();
}
-class _ChatMentionPageMenuState extends State<ChatMentionPageMenu> {
+class _PromptInputMentionPageMenuState
+ extends State<PromptInputMentionPageMenu> {
@override
void initState() {
super.initState();
@@ -92,7 +94,7 @@ class _ChatMentionPageMenuState extends State<ChatMentionPageMenu> {
],
),
child: TextFieldTapRegion(
- child: ChatMentionPageList(
+ child: PromptInputMentionPageList(
onPageSelected: widget.onPageSelected,
),
),
@@ -143,8 +145,8 @@ class _ChatMentionPageMenuState extends State<ChatMentionPageMenu> {
}
}
-class ChatMentionPageList extends StatefulWidget {
- const ChatMentionPageList({
+class PromptInputMentionPageList extends StatefulWidget {
+ const PromptInputMentionPageList({
super.key,
required this.onPageSelected,
});
@@ -152,10 +154,12 @@ class ChatMentionPageList extends StatefulWidget {
final void Function(ViewPB view) onPageSelected;
@override
- State<ChatMentionPageList> createState() => _ChatMentionPageListState();
+ State<PromptInputMentionPageList> createState() =>
+ _PromptInputMentionPageListState();
}
-class _ChatMentionPageListState extends State<ChatMentionPageList> {
+class _PromptInputMentionPageListState
+ extends State<PromptInputMentionPageList> {
final autoScrollController = SimpleAutoScrollController(
suggestedRowHeight: _itemHeight,
beginGetter: (rect) => rect.top + 8.0,
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input_span.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mentioned_page_text_span.dart
similarity index 95%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input_span.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mentioned_page_text_span.dart
index 06d8248048..7b519226a3 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input_span.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/mentioned_page_text_span.dart
@@ -5,8 +5,8 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:extended_text_library/extended_text_library.dart';
import 'package:flutter/material.dart';
-class ChatInputTextSpanBuilder extends SpecialTextSpanBuilder {
- ChatInputTextSpanBuilder({
+class PromptInputTextSpanBuilder extends SpecialTextSpanBuilder {
+ PromptInputTextSpanBuilder({
required this.inputControlCubit,
this.specialTextStyle,
});
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/predefined_format_buttons.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/predefined_format_buttons.dart
similarity index 88%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/predefined_format_buttons.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/predefined_format_buttons.dart
index 08aa0e84ee..fe3b07cc13 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/predefined_format_buttons.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/predefined_format_buttons.dart
@@ -5,21 +5,20 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flutter/material.dart';
+import 'package:universal_platform/universal_platform.dart';
-import '../layout_define.dart';
+import 'layout_define.dart';
class PromptInputDesktopToggleFormatButton extends StatelessWidget {
const PromptInputDesktopToggleFormatButton({
super.key,
required this.showFormatBar,
required this.predefinedFormat,
- required this.predefinedTextFormat,
required this.onTap,
});
final bool showFormatBar;
- final ImageFormat predefinedFormat;
- final TextFormat? predefinedTextFormat;
+ final PredefinedFormat predefinedFormat;
final VoidCallback onTap;
@override
@@ -49,15 +48,11 @@ class ChangeFormatBar extends StatelessWidget {
const ChangeFormatBar({
super.key,
required this.predefinedFormat,
- required this.buttonSize,
- required this.iconSize,
required this.spacing,
required this.onSelectPredefinedFormat,
});
final PredefinedFormat? predefinedFormat;
- final double buttonSize;
- final double iconSize;
final double spacing;
final void Function(PredefinedFormat) onSelectPredefinedFormat;
@@ -106,15 +101,15 @@ class ChangeFormatBar extends StatelessWidget {
child: FlowyTooltip(
message: format.i18n,
child: SizedBox.square(
- dimension: buttonSize,
+ dimension: _buttonSize,
child: FlowyHover(
isSelected: () => format == predefinedFormat?.imageFormat,
child: Center(
child: FlowySvg(
format.icon,
size: format == ImageFormat.textAndImage
- ? Size(21.0 / 16.0 * iconSize, iconSize)
- : Size.square(iconSize),
+ ? Size(21.0 / 16.0 * _iconSize, _iconSize)
+ : Size.square(_iconSize),
),
),
),
@@ -152,13 +147,13 @@ class ChangeFormatBar extends StatelessWidget {
child: FlowyTooltip(
message: format.i18n,
child: SizedBox.square(
- dimension: buttonSize,
+ dimension: _buttonSize,
child: FlowyHover(
isSelected: () => format == predefinedFormat?.textFormat,
child: Center(
child: FlowySvg(
format.icon,
- size: Size.square(iconSize),
+ size: Size.square(_iconSize),
),
),
),
@@ -166,6 +161,18 @@ class ChangeFormatBar extends StatelessWidget {
),
);
}
+
+ double get _buttonSize {
+ return UniversalPlatform.isMobile
+ ? MobileAIPromptSizes.predefinedFormatButtonHeight
+ : DesktopAIPromptSizes.predefinedFormatButtonHeight;
+ }
+
+ double get _iconSize {
+ return UniversalPlatform.isMobile
+ ? MobileAIPromptSizes.predefinedFormatIconHeight
+ : DesktopAIPromptSizes.predefinedFormatIconHeight;
+ }
}
class PromptInputMobileToggleFormatButton extends StatelessWidget {
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/select_sources_bottom_sheet.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_bottom_sheet.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/select_sources_bottom_sheet.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_bottom_sheet.dart
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/select_sources_menu.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_menu.dart
similarity index 99%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/select_sources_menu.dart
rename to frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_menu.dart
index ebd0a1dfe7..df521256d8 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/select_sources_menu.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_menu.dart
@@ -18,8 +18,8 @@ import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import '../layout_define.dart';
-import 'chat_mention_page_menu.dart';
+import 'layout_define.dart';
+import 'mention_page_menu.dart';
class PromptInputDesktopSelectSourcesButton extends StatefulWidget {
const PromptInputDesktopSelectSourcesButton({
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/send_button.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/send_button.dart
new file mode 100644
index 0000000000..20def4ca5e
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/send_button.dart
@@ -0,0 +1,70 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:universal_platform/universal_platform.dart';
+
+import 'layout_define.dart';
+
+enum SendButtonState { enabled, streaming, disabled }
+
+class PromptInputSendButton extends StatelessWidget {
+ const PromptInputSendButton({
+ super.key,
+ required this.state,
+ required this.onSendPressed,
+ required this.onStopStreaming,
+ });
+
+ final SendButtonState state;
+ final VoidCallback onSendPressed;
+ final VoidCallback onStopStreaming;
+
+ @override
+ Widget build(BuildContext context) {
+ return FlowyIconButton(
+ width: _buttonSize,
+ icon: switch (state) {
+ SendButtonState.enabled => FlowySvg(
+ FlowySvgs.ai_send_filled_s,
+ size: Size.square(_iconSize),
+ color: Theme.of(context).colorScheme.primary,
+ ),
+ SendButtonState.disabled => FlowySvg(
+ FlowySvgs.ai_send_filled_s,
+ size: Size.square(_iconSize),
+ color: Theme.of(context).disabledColor,
+ ),
+ SendButtonState.streaming => FlowySvg(
+ FlowySvgs.ai_stop_filled_s,
+ size: Size.square(_iconSize),
+ color: Theme.of(context).colorScheme.primary,
+ ),
+ },
+ onPressed: () {
+ switch (state) {
+ case SendButtonState.enabled:
+ onSendPressed();
+ break;
+ case SendButtonState.streaming:
+ onStopStreaming();
+ break;
+ case SendButtonState.disabled:
+ break;
+ }
+ },
+ hoverColor: Colors.transparent,
+ );
+ }
+
+ double get _buttonSize {
+ return UniversalPlatform.isMobile
+ ? MobileAIPromptSizes.sendButtonSize
+ : DesktopAIPromptSizes.actionBarSendButtonSize;
+ }
+
+ double get _iconSize {
+ return UniversalPlatform.isMobile
+ ? MobileAIPromptSizes.sendButtonSize
+ : DesktopAIPromptSizes.actionBarSendButtonIconSize;
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
index db27787292..4d6a6a1c57 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
@@ -24,8 +24,8 @@ import 'application/chat_entity.dart';
import 'application/chat_member_bloc.dart';
import 'application/chat_message_stream.dart';
import 'presentation/animated_chat_list.dart';
-import 'presentation/chat_input/desktop_ai_prompt_input.dart';
-import 'presentation/chat_input/mobile_ai_prompt_input.dart';
+import 'presentation/chat_input/desktop_chat_input.dart';
+import 'presentation/chat_input/mobile_chat_input.dart';
import 'presentation/chat_related_question.dart';
import 'presentation/chat_welcome_page.dart';
import 'presentation/layout_define.dart';
@@ -285,7 +285,7 @@ class _ChatContentPage extends StatelessWidget {
final chatBloc = context.read<ChatBloc>();
return UniversalPlatform.isDesktop
- ? DesktopAIPromptInput(
+ ? DesktopChatInput(
chatId: view.id,
isStreaming: !canSendMessage,
onStopStreaming: () {
@@ -308,7 +308,7 @@ class _ChatContentPage extends StatelessWidget {
);
},
)
- : MobileAIPromptInput(
+ : MobileChatInput(
chatId: view.id,
isStreaming: !canSendMessage,
onStopStreaming: () {
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_avatar.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_avatar.dart
index d9d4594240..378d69d022 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_avatar.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_avatar.dart
@@ -17,8 +17,8 @@ class ChatAIAvatar extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
- width: DesktopAIConvoSizes.avatarSize,
- height: DesktopAIConvoSizes.avatarSize,
+ width: DesktopAIChatSizes.avatarSize,
+ height: DesktopAIChatSizes.avatarSize,
clipBehavior: Clip.hardEdge,
decoration: const BoxDecoration(shape: BoxShape.circle),
foregroundDecoration: ShapeDecoration(
@@ -61,8 +61,8 @@ class ChatUserAvatar extends StatelessWidget {
child = _buildEmojiAvatar(context);
}
return Container(
- width: DesktopAIConvoSizes.avatarSize,
- height: DesktopAIConvoSizes.avatarSize,
+ width: DesktopAIChatSizes.avatarSize,
+ height: DesktopAIChatSizes.avatarSize,
clipBehavior: Clip.hardEdge,
decoration: const BoxDecoration(shape: BoxShape.circle),
foregroundDecoration: ShapeDecoration(
@@ -102,7 +102,7 @@ class ChatUserAvatar extends StatelessWidget {
Widget _buildUrlAvatar(BuildContext context) {
return CircleAvatar(
backgroundColor: Colors.transparent,
- radius: DesktopAIConvoSizes.avatarSize / 2,
+ radius: DesktopAIChatSizes.avatarSize / 2,
child: Image.network(
iconUrl,
fit: BoxFit.cover,
@@ -115,7 +115,7 @@ class ChatUserAvatar extends StatelessWidget {
Widget _buildEmojiAvatar(BuildContext context) {
return CircleAvatar(
backgroundColor: Colors.transparent,
- radius: DesktopAIConvoSizes.avatarSize / 2,
+ radius: DesktopAIChatSizes.avatarSize / 2,
child: builtInSVGIcons.contains(iconUrl)
? FlowySvg(
FlowySvgData('emoji/$iconUrl'),
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_ai_prompt_input.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_chat_input.dart
similarity index 74%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_ai_prompt_input.dart
rename to frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_chat_input.dart
index 86342869c4..c38e9dadc2 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_ai_prompt_input.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/desktop_chat_input.dart
@@ -1,27 +1,21 @@
+import 'package:appflowy/ai/ai.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/ai_chat/application/ai_prompt_input_bloc.dart';
+import 'package:appflowy/plugins/ai_chat/application/chat_entity.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_input_control_cubit.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
-import 'package:extended_text_field/extended_text_field.dart';
import 'package:flowy_infra/file_picker/file_picker_service.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../application/chat_entity.dart';
import '../layout_define.dart';
-import 'ai_prompt_buttons.dart';
-import 'chat_input_file.dart';
-import 'chat_input_span.dart';
-import 'chat_mention_page_menu.dart';
-import 'predefined_format_buttons.dart';
-import 'select_sources_menu.dart';
-
-class DesktopAIPromptInput extends StatefulWidget {
- const DesktopAIPromptInput({
+
+class DesktopChatInput extends StatefulWidget {
+ const DesktopChatInput({
super.key,
required this.chatId,
required this.isStreaming,
@@ -38,10 +32,10 @@ class DesktopAIPromptInput extends StatefulWidget {
final void Function(List<String>) onUpdateSelectedSources;
@override
- State<DesktopAIPromptInput> createState() => _DesktopAIPromptInputState();
+ State<DesktopChatInput> createState() => _DesktopChatInputState();
}
-class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
+class _DesktopChatInputState extends State<DesktopChatInput> {
final textFieldKey = GlobalKey();
final layerLink = LayerLink();
final overlayController = OverlayPortalController();
@@ -55,6 +49,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
textFormat: TextFormat.bulletList,
);
late SendButtonState sendButtonState;
+ bool isComposing = false;
@override
void initState() {
@@ -110,8 +105,8 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
child: OverlayPortal(
controller: overlayController,
overlayChildBuilder: (context) {
- return ChatMentionPageMenu(
- anchor: ChatInputAnchor(textFieldKey, layerLink),
+ return PromptInputMentionPageMenu(
+ anchor: PromptInputAnchor(textFieldKey, layerLink),
textController: textController,
onPageSelected: handlePageSelected,
);
@@ -125,7 +120,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
width: focusNode.hasFocus ? 1.5 : 1.0,
strokeAlign: BorderSide.strokeAlignOutside,
),
- borderRadius: DesktopAIPromptSizes.promptFrameRadius,
+ borderRadius: const BorderRadius.all(Radius.circular(12.0)),
),
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -137,7 +132,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
DesktopAIPromptSizes.attachedFilesPreviewHeight,
),
child: TextFieldTapRegion(
- child: ChatInputFile(
+ child: PromptInputFile(
chatId: widget.chatId,
onDeleted: (file) => context
.read<AIPromptInputBloc>()
@@ -161,12 +156,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
const EdgeInsetsDirectional.only(start: 8.0),
child: ChangeFormatBar(
predefinedFormat: predefinedFormat,
- spacing: DesktopAIPromptSizes
- .predefinedFormatBarButtonSpacing,
- iconSize: DesktopAIPromptSizes
- .predefinedFormatIconHeight,
- buttonSize: DesktopAIPromptSizes
- .predefinedFormatButtonHeight,
+ spacing: 4.0,
onSelectPredefinedFormat: (format) {
setState(() => predefinedFormat = format);
},
@@ -182,8 +172,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
overlayController: overlayController,
focusNode: focusNode,
showPredefinedFormats: showPredefinedFormatSection,
- predefinedFormat: predefinedFormat.imageFormat,
- predefinedTextFormat: predefinedFormat.textFormat,
+ predefinedFormat: predefinedFormat,
onTogglePredefinedFormatSection: () {
setState(() {
showPredefinedFormatSection =
@@ -191,7 +180,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
});
},
sendButtonState: sendButtonState,
- onSendPressed: handleSendPressed,
+ onSendPressed: handleSend,
onStopStreaming: widget.onStopStreaming,
onUpdateSelectedSources:
widget.onUpdateSelectedSources,
@@ -208,18 +197,6 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
);
}
- BoxConstraints getTextFieldConstraints() {
- double minHeight = DesktopAIPromptSizes.textFieldMinHeight +
- DesktopAIPromptSizes.actionBarHeight +
- DesktopAIPromptSizes.actionBarPadding.vertical;
- double maxHeight = 300;
- if (showPredefinedFormatSection) {
- minHeight += DesktopAIPromptSizes.predefinedFormatButtonHeight;
- maxHeight += DesktopAIPromptSizes.predefinedFormatButtonHeight;
- }
- return BoxConstraints(minHeight: minHeight, maxHeight: maxHeight);
- }
-
void cancelMentionPage() {
if (overlayController.isShowing) {
inputControlCubit.reset();
@@ -237,7 +214,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
}
}
- void handleSendPressed() {
+ void handleSend() {
if (widget.isStreaming) {
return;
}
@@ -260,13 +237,16 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
}
void handleTextControllerChanged() {
- if (!textController.value.composing.isCollapsed) {
+ setState(() {
+ // update whether send button is clickable
+ updateSendButtonState();
+ isComposing = !textController.value.composing.isCollapsed;
+ });
+
+ if (isComposing) {
return;
}
- // update whether send button is clickable
- setState(() => updateSendButtonState());
-
// handle text and selection changes ONLY when mentioning a page
// disable mention
@@ -323,6 +303,16 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
}
}
+ KeyEventResult handleKeyEvent(FocusNode node, KeyEvent event) {
+ if (event.character == '@') {
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ inputControlCubit.startSearching(textController.value);
+ overlayController.show();
+ });
+ }
+ return KeyEventResult.ignored;
+ }
+
void handlePageSelected(ViewPB view) {
final newText = textController.text.replaceRange(
inputControlCubit.filterStartPosition,
@@ -341,36 +331,69 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
overlayController.hide();
}
+ BoxConstraints getTextFieldConstraints() {
+ double minHeight = DesktopAIPromptSizes.textFieldMinHeight +
+ DesktopAIPromptSizes.actionBarSendButtonSize +
+ DesktopAIChatSizes.inputActionBarMargin.vertical;
+ double maxHeight = 300;
+ if (showPredefinedFormatSection) {
+ minHeight += DesktopAIPromptSizes.predefinedFormatButtonHeight;
+ maxHeight += DesktopAIPromptSizes.predefinedFormatButtonHeight;
+ }
+ return BoxConstraints(minHeight: minHeight, maxHeight: maxHeight);
+ }
+
Widget inputTextField() {
- return Actions(
- actions: buildActions(),
- child: CompositedTransformTarget(
- link: layerLink,
- child: BlocBuilder<AIPromptInputBloc, AIPromptInputState>(
- builder: (context, state) {
- return _PromptTextField(
- key: textFieldKey,
- cubit: inputControlCubit,
- textController: textController,
- textFieldFocusNode: focusNode,
- showPredefinedFormatSection: showPredefinedFormatSection,
- hintText: switch (state.aiType) {
- AIType.appflowyAI => LocaleKeys.chat_inputMessageHint.tr(),
- AIType.localAI => LocaleKeys.chat_inputLocalAIMessageHint.tr()
- },
- // onStartMentioningPage: () {
- // WidgetsBinding.instance.addPostFrameCallback((_) {
- // inputControlCubit.startSearching(textController.value);
- // overlayController.show();
- // });
- // },
- );
- },
+ return Shortcuts(
+ shortcuts: buildShortcuts(),
+ child: Actions(
+ actions: buildActions(),
+ child: CompositedTransformTarget(
+ link: layerLink,
+ child: BlocBuilder<AIPromptInputBloc, AIPromptInputState>(
+ builder: (context, state) {
+ return PromptInputTextField(
+ key: textFieldKey,
+ cubit: inputControlCubit,
+ textController: textController,
+ textFieldFocusNode: focusNode,
+ contentPadding: calculateContentPadding(),
+ hintText: switch (state.aiType) {
+ AIType.appflowyAI => LocaleKeys.chat_inputMessageHint.tr(),
+ AIType.localAI => LocaleKeys.chat_inputLocalAIMessageHint.tr()
+ },
+ );
+ },
+ ),
),
),
);
}
+ EdgeInsetsGeometry calculateContentPadding() {
+ final top = showPredefinedFormatSection
+ ? DesktopAIPromptSizes.predefinedFormatButtonHeight
+ : 0.0;
+ final bottom = DesktopAIPromptSizes.actionBarSendButtonSize +
+ DesktopAIChatSizes.inputActionBarMargin.vertical;
+
+ return DesktopAIPromptSizes.textFieldContentPadding
+ .add(EdgeInsets.only(top: top, bottom: bottom));
+ }
+
+ Map<ShortcutActivator, Intent> buildShortcuts() {
+ if (isComposing) {
+ return const {};
+ }
+
+ return const {
+ SingleActivator(LogicalKeyboardKey.arrowUp): _FocusPreviousItemIntent(),
+ SingleActivator(LogicalKeyboardKey.arrowDown): _FocusNextItemIntent(),
+ SingleActivator(LogicalKeyboardKey.escape): _CancelMentionPageIntent(),
+ SingleActivator(LogicalKeyboardKey.enter): _SubmitOrMentionPageIntent(),
+ };
+ }
+
Map<Type, Action<Intent>> buildActions() {
return {
_FocusPreviousItemIntent: CallbackAction<_FocusPreviousItemIntent>(
@@ -404,7 +427,7 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
orElse: () {},
);
} else {
- handleSendPressed();
+ handleSend();
}
return;
},
@@ -413,115 +436,6 @@ class _DesktopAIPromptInputState extends State<DesktopAIPromptInput> {
}
}
-class _PromptTextField extends StatefulWidget {
- const _PromptTextField({
- super.key,
- required this.cubit,
- required this.textController,
- required this.textFieldFocusNode,
- this.showPredefinedFormatSection = false,
- this.hintText = "",
- // this.onStartMentioningPage,
- });
-
- final ChatInputControlCubit cubit;
- final TextEditingController textController;
- final FocusNode textFieldFocusNode;
- final bool showPredefinedFormatSection;
- final String hintText;
- // final void Function()? onStartMentioningPage;
-
- @override
- State<_PromptTextField> createState() => _PromptTextFieldState();
-}
-
-class _PromptTextFieldState extends State<_PromptTextField> {
- bool isComposing = false;
-
- @override
- void initState() {
- super.initState();
- // widget.textFieldFocusNode.onKeyEvent = handleKeyEvent;
- widget.textController.addListener(onTextChanged);
- }
-
- @override
- void dispose() {
- // widget.textFieldFocusNode.onKeyEvent = null;
- widget.textController.removeListener(onTextChanged);
- super.dispose();
- }
-
- @override
- Widget build(BuildContext context) {
- return Shortcuts(
- shortcuts: buildShortcuts(),
- child: ExtendedTextField(
- controller: widget.textController,
- focusNode: widget.textFieldFocusNode,
- decoration: InputDecoration(
- border: InputBorder.none,
- enabledBorder: InputBorder.none,
- focusedBorder: InputBorder.none,
- contentPadding: calculateContentPadding(),
- hintText: widget.hintText,
- hintStyle: AIChatUILayout.inputHintTextStyle(context),
- isCollapsed: true,
- isDense: true,
- ),
- keyboardType: TextInputType.multiline,
- textCapitalization: TextCapitalization.sentences,
- minLines: 1,
- maxLines: null,
- style: Theme.of(context).textTheme.bodyMedium,
- specialTextSpanBuilder: ChatInputTextSpanBuilder(
- inputControlCubit: widget.cubit,
- specialTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
- color: Theme.of(context).colorScheme.primary,
- fontWeight: FontWeight.w600,
- ),
- ),
- ),
- );
- }
-
- // KeyEventResult handleKeyEvent(FocusNode node, KeyEvent event) {
- // if (event.character == '@') {
- // widget.onStartMentioningPage();
- // }
- // return KeyEventResult.ignored;
- // }
-
- void onTextChanged() {
- setState(
- () => isComposing = !widget.textController.value.composing.isCollapsed,
- );
- }
-
- EdgeInsetsGeometry calculateContentPadding() {
- final top = widget.showPredefinedFormatSection
- ? DesktopAIPromptSizes.predefinedFormatButtonHeight
- : 0.0;
- const bottom = DesktopAIPromptSizes.actionBarHeight;
-
- return DesktopAIPromptSizes.textFieldContentPadding
- .add(EdgeInsets.only(top: top, bottom: bottom));
- }
-
- Map<ShortcutActivator, Intent> buildShortcuts() {
- if (isComposing) {
- return const {};
- }
-
- return const {
- SingleActivator(LogicalKeyboardKey.arrowUp): _FocusPreviousItemIntent(),
- SingleActivator(LogicalKeyboardKey.arrowDown): _FocusNextItemIntent(),
- SingleActivator(LogicalKeyboardKey.escape): _CancelMentionPageIntent(),
- SingleActivator(LogicalKeyboardKey.enter): _SubmitOrMentionPageIntent(),
- };
- }
-}
-
class _SubmitOrMentionPageIntent extends Intent {
const _SubmitOrMentionPageIntent();
}
@@ -545,7 +459,6 @@ class _PromptBottomActions extends StatelessWidget {
required this.focusNode,
required this.sendButtonState,
required this.predefinedFormat,
- required this.predefinedTextFormat,
required this.onTogglePredefinedFormatSection,
required this.showPredefinedFormats,
required this.onSendPressed,
@@ -557,8 +470,7 @@ class _PromptBottomActions extends StatelessWidget {
final OverlayPortalController overlayController;
final FocusNode focusNode;
final bool showPredefinedFormats;
- final ImageFormat predefinedFormat;
- final TextFormat? predefinedTextFormat;
+ final PredefinedFormat predefinedFormat;
final void Function() onTogglePredefinedFormatSection;
final SendButtonState sendButtonState;
final void Function() onSendPressed;
@@ -568,8 +480,8 @@ class _PromptBottomActions extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
- height: DesktopAIPromptSizes.actionBarHeight,
- margin: DesktopAIPromptSizes.actionBarPadding,
+ height: DesktopAIPromptSizes.actionBarSendButtonSize,
+ margin: DesktopAIChatSizes.inputActionBarMargin,
child: BlocBuilder<AIPromptInputBloc, AIPromptInputState>(
builder: (context, state) {
if (state.chatState == null) {
@@ -585,7 +497,7 @@ class _PromptBottomActions extends StatelessWidget {
if (state.aiType == AIType.appflowyAI) ...[
_selectSourcesButton(context),
const HSpace(
- DesktopAIPromptSizes.actionBarButtonSpacing,
+ DesktopAIChatSizes.inputActionBarButtonSpacing,
),
],
// _mentionButton(context),
@@ -595,7 +507,7 @@ class _PromptBottomActions extends StatelessWidget {
if (state.supportChatWithFile) ...[
_attachmentButton(context),
const HSpace(
- DesktopAIPromptSizes.actionBarButtonSpacing,
+ DesktopAIChatSizes.inputActionBarButtonSpacing,
),
],
_sendButton(),
@@ -610,7 +522,6 @@ class _PromptBottomActions extends StatelessWidget {
return PromptInputDesktopToggleFormatButton(
showFormatBar: showPredefinedFormats,
predefinedFormat: predefinedFormat,
- predefinedTextFormat: predefinedTextFormat,
onTap: onTogglePredefinedFormatSection,
);
}
@@ -669,8 +580,6 @@ class _PromptBottomActions extends StatelessWidget {
Widget _sendButton() {
return PromptInputSendButton(
- buttonSize: DesktopAIPromptSizes.actionBarHeight,
- iconSize: DesktopAIPromptSizes.sendButtonSize,
state: sendButtonState,
onSendPressed: onSendPressed,
onStopStreaming: onStopStreaming,
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_ai_prompt_input.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_chat_input.dart
similarity index 79%
rename from frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_ai_prompt_input.dart
rename to frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_chat_input.dart
index bba56b7b47..9b667889e9 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_ai_prompt_input.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/mobile_chat_input.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/ai/ai.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/ai_chat/application/ai_prompt_input_bloc.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_entity.dart';
@@ -10,15 +11,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../layout_define.dart';
-import 'ai_prompt_buttons.dart';
-import 'chat_input_file.dart';
-import 'chat_input_span.dart';
-import 'chat_mention_page_bottom_sheet.dart';
-import 'predefined_format_buttons.dart';
-import 'select_sources_bottom_sheet.dart';
-class MobileAIPromptInput extends StatefulWidget {
- const MobileAIPromptInput({
+class MobileChatInput extends StatefulWidget {
+ const MobileChatInput({
super.key,
required this.chatId,
required this.isStreaming,
@@ -35,10 +30,10 @@ class MobileAIPromptInput extends StatefulWidget {
final void Function(List<String>) onUpdateSelectedSources;
@override
- State<MobileAIPromptInput> createState() => _MobileAIPromptInputState();
+ State<MobileChatInput> createState() => _MobileChatInputState();
}
-class _MobileAIPromptInputState extends State<MobileAIPromptInput> {
+class _MobileChatInputState extends State<MobileChatInput> {
final inputControlCubit = ChatInputControlCubit();
final focusNode = FocusNode();
final textController = TextEditingController();
@@ -108,7 +103,8 @@ class _MobileAIPromptInputState extends State<MobileAIPromptInput> {
color: Color.fromRGBO(0, 0, 0, 0.05),
),
],
- borderRadius: MobileAIPromptSizes.promptFrameRadius,
+ borderRadius:
+ const BorderRadius.vertical(top: Radius.circular(8.0)),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -119,7 +115,7 @@ class _MobileAIPromptInputState extends State<MobileAIPromptInput> {
MobileAIPromptSizes.attachedFilesBarPadding.vertical +
MobileAIPromptSizes.attachedFilesPreviewHeight,
),
- child: ChatInputFile(
+ child: PromptInputFile(
chatId: widget.chatId,
onDeleted: (file) => context
.read<AIPromptInputBloc>()
@@ -128,31 +124,31 @@ class _MobileAIPromptInputState extends State<MobileAIPromptInput> {
),
if (showPredefinedFormatSection)
TextFieldTapRegion(
- child: Container(
- padding: MobileAIPromptSizes.predefinedFormatBarPadding,
+ child: Padding(
+ padding: const EdgeInsets.all(8.0),
child: ChangeFormatBar(
predefinedFormat: predefinedFormat,
- spacing: MobileAIPromptSizes
- .predefinedFormatBarButtonSpacing,
- iconSize:
- MobileAIPromptSizes.predefinedFormatIconHeight,
- buttonSize:
- MobileAIPromptSizes.predefinedFormatButtonHeight,
+ spacing: 8.0,
onSelectPredefinedFormat: (format) {
setState(() => predefinedFormat = format);
},
),
),
- ),
+ )
+ else
+ const VSpace(8.0),
inputTextField(context),
- Row(
- children: [
- const HSpace(8.0),
- leadingButtons(context),
- const Spacer(),
- sendButton(),
- const HSpace(12.0),
- ],
+ Container(
+ padding: const EdgeInsets.symmetric(vertical: 8.0),
+ child: Row(
+ children: [
+ const HSpace(8.0),
+ leadingButtons(context),
+ const Spacer(),
+ sendButton(),
+ const HSpace(12.0),
+ ],
+ ),
),
],
),
@@ -278,7 +274,7 @@ class _MobileAIPromptInputState extends State<MobileAIPromptInput> {
maxLines: null,
style:
Theme.of(context).textTheme.bodyMedium?.copyWith(height: 20 / 14),
- specialTextSpanBuilder: ChatInputTextSpanBuilder(
+ specialTextSpanBuilder: PromptInputTextSpanBuilder(
inputControlCubit: inputControlCubit,
specialTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.primary,
@@ -291,40 +287,32 @@ class _MobileAIPromptInputState extends State<MobileAIPromptInput> {
}
Widget leadingButtons(BuildContext context) {
- return Container(
- padding: const EdgeInsets.symmetric(vertical: 8.0),
- child: _LeadingActions(
- // onMention: () {
- // textController.text += '@';
- // if (!focusNode.hasFocus) {
- // focusNode.requestFocus();
- // }
- // WidgetsBinding.instance.addPostFrameCallback((_) {
- // mentionPage(context);
- // });
- // },
- showPredefinedFormatSection: showPredefinedFormatSection,
- predefinedFormat: predefinedFormat,
- onTogglePredefinedFormatSection: () {
- setState(() {
- showPredefinedFormatSection = !showPredefinedFormatSection;
- });
- },
- onUpdateSelectedSources: widget.onUpdateSelectedSources,
- ),
+ return _LeadingActions(
+ // onMention: () {
+ // textController.text += '@';
+ // if (!focusNode.hasFocus) {
+ // focusNode.requestFocus();
+ // }
+ // WidgetsBinding.instance.addPostFrameCallback((_) {
+ // mentionPage(context);
+ // });
+ // },
+ showPredefinedFormatSection: showPredefinedFormatSection,
+ predefinedFormat: predefinedFormat,
+ onTogglePredefinedFormatSection: () {
+ setState(() {
+ showPredefinedFormatSection = !showPredefinedFormatSection;
+ });
+ },
+ onUpdateSelectedSources: widget.onUpdateSelectedSources,
);
}
Widget sendButton() {
- return Container(
- alignment: Alignment.bottomCenter,
- child: PromptInputSendButton(
- buttonSize: MobileAIPromptSizes.sendButtonSize,
- iconSize: MobileAIPromptSizes.sendButtonSize,
- onSendPressed: handleSendPressed,
- onStopStreaming: widget.onStopStreaming,
- state: sendButtonState,
- ),
+ return PromptInputSendButton(
+ state: sendButtonState,
+ onSendPressed: handleSendPressed,
+ onStopStreaming: widget.onStopStreaming,
);
}
}
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/layout_define.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/layout_define.dart
index fdc2784ca1..eddf778e8a 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/layout_define.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/layout_define.dart
@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
import 'package:universal_platform/universal_platform.dart';
class AIChatUILayout {
+ const AIChatUILayout._();
+
static EdgeInsets safeAreaInsets(BuildContext context) {
final query = MediaQuery.of(context);
return UniversalPlatform.isMobile
@@ -28,63 +30,22 @@ class AIChatUILayout {
}
}
-class DesktopAIPromptSizes {
- static const promptFrameRadius = BorderRadius.all(Radius.circular(12.0));
-
- static const attachedFilesBarPadding =
- EdgeInsets.only(left: 8.0, top: 8.0, right: 8.0);
- static const attachedFilesPreviewHeight = 48.0;
- static const attachedFilesPreviewSpacing = 12.0;
-
- static const predefinedFormatButtonHeight = 28.0;
- static const predefinedFormatIconHeight = 16.0;
- static const predefinedFormatBarButtonSpacing = 4.0;
-
- static const textFieldMinHeight = 36.0;
- static const textFieldContentPadding =
- EdgeInsetsDirectional.fromSTEB(14.0, 8.0, 14.0, 8.0);
-
- static const actionBarHeight = 32.0;
- static const actionBarPadding = EdgeInsetsDirectional.fromSTEB(8, 0, 8, 4);
- static const actionBarButtonSize = 28.0;
- static const actionBarIconSize = 16.0;
- static const actionBarButtonSpacing = 4.0;
- static const sendButtonSize = 24.0;
-}
-
-class MobileAIPromptSizes {
- static const promptFrameRadius =
- BorderRadius.vertical(top: Radius.circular(8.0));
+class DesktopAIChatSizes {
+ const DesktopAIChatSizes._();
- static const attachedFilesBarHeight = 68.0;
- static const attachedFilesBarPadding =
- EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0, bottom: 4.0);
- static const attachedFilesPreviewHeight = 56.0;
- static const attachedFilesPreviewSpacing = 8.0;
-
- static const predefinedFormatButtonHeight = 32.0;
- static const predefinedFormatIconHeight = 20.0;
- static const predefinedFormatBarButtonSpacing = 8.0;
- static const predefinedFormatBarPadding = EdgeInsets.all(8.0);
-
- static const textFieldMinHeight = 32.0;
- static const textFieldContentPadding =
- EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0);
-
- static const mentionIconSize = 20.0;
- static const sendButtonSize = 32.0;
-}
-
-class DesktopAIConvoSizes {
static const avatarSize = 32.0;
-
static const avatarAndChatBubbleSpacing = 12.0;
- static const actionBarIconSize = 28.0;
- static const actionBarIconSpacing = 8.0;
- static const hoverActionBarPadding = EdgeInsets.all(2.0);
- static const hoverActionBarRadius = BorderRadius.all(Radius.circular(8.0));
- static const hoverActionBarIconRadius =
+ static const messageActionBarIconSize = 28.0;
+ static const messageHoverActionBarPadding = EdgeInsets.all(2.0);
+ static const messageHoverActionBarRadius =
+ BorderRadius.all(Radius.circular(8.0));
+ static const messageHoverActionBarIconRadius =
BorderRadius.all(Radius.circular(6.0));
- static const actionBarIconRadius = BorderRadius.all(Radius.circular(8.0));
+ static const messageActionBarIconRadius =
+ BorderRadius.all(Radius.circular(8.0));
+
+ static const inputActionBarMargin =
+ EdgeInsetsDirectional.fromSTEB(8, 0, 8, 4);
+ static const inputActionBarButtonSpacing = 4.0;
}
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart
index e5229daf40..8fd3d615ca 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart
@@ -1,6 +1,9 @@
import 'dart:async';
import 'dart:convert';
+import 'package:appflowy/ai/widgets/prompt_input/layout_define.dart';
+import 'package:appflowy/ai/widgets/prompt_input/predefined_format_buttons.dart';
+import 'package:appflowy/ai/widgets/prompt_input/select_sources_menu.dart';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_ai_message_bloc.dart';
@@ -30,8 +33,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_chat_core/flutter_chat_core.dart';
-import '../chat_input/predefined_format_buttons.dart';
-import '../chat_input/select_sources_menu.dart';
import '../layout_define.dart';
import 'message_util.dart';
@@ -64,16 +65,15 @@ class _AIMessageActionBarState extends State<AIMessageActionBar> {
final child = SeparatedRow(
mainAxisSize: MainAxisSize.min,
- separatorBuilder: () =>
- const HSpace(DesktopAIConvoSizes.actionBarIconSpacing),
+ separatorBuilder: () => const HSpace(8.0),
children: _buildChildren(),
);
return widget.showDecoration
? Container(
- padding: const EdgeInsets.all(2.0),
+ padding: DesktopAIChatSizes.messageHoverActionBarPadding,
decoration: BoxDecoration(
- borderRadius: DesktopAIConvoSizes.hoverActionBarRadius,
+ borderRadius: DesktopAIChatSizes.messageHoverActionBarRadius,
border: Border.all(
color: isLightMode
? const Color(0x1F1F2329)
@@ -153,11 +153,11 @@ class CopyButton extends StatelessWidget {
return FlowyTooltip(
message: LocaleKeys.settings_menu_clickToCopy.tr(),
child: FlowyIconButton(
- width: DesktopAIConvoSizes.actionBarIconSize,
+ width: DesktopAIChatSizes.messageActionBarIconSize,
hoverColor: AFThemeExtension.of(context).lightGreyHover,
radius: isInHoverBar
- ? DesktopAIConvoSizes.hoverActionBarIconRadius
- : DesktopAIConvoSizes.actionBarIconRadius,
+ ? DesktopAIChatSizes.messageHoverActionBarIconRadius
+ : DesktopAIChatSizes.messageActionBarIconRadius,
icon: FlowySvg(
FlowySvgs.copy_s,
color: Theme.of(context).hintColor,
@@ -198,11 +198,11 @@ class RegenerateButton extends StatelessWidget {
return FlowyTooltip(
message: LocaleKeys.chat_regenerate.tr(),
child: FlowyIconButton(
- width: DesktopAIConvoSizes.actionBarIconSize,
+ width: DesktopAIChatSizes.messageActionBarIconSize,
hoverColor: AFThemeExtension.of(context).lightGreyHover,
radius: isInHoverBar
- ? DesktopAIConvoSizes.hoverActionBarIconRadius
- : DesktopAIConvoSizes.actionBarIconRadius,
+ ? DesktopAIChatSizes.messageHoverActionBarIconRadius
+ : DesktopAIChatSizes.messageActionBarIconRadius,
icon: FlowySvg(
FlowySvgs.ai_undo_s,
color: Theme.of(context).hintColor,
@@ -258,11 +258,11 @@ class _ChangeFormatButtonState extends State<ChangeFormatButton> {
message: LocaleKeys.chat_changeFormat_actionButton.tr(),
child: FlowyIconButton(
width: 32.0,
- height: DesktopAIConvoSizes.actionBarIconSize,
+ height: DesktopAIChatSizes.messageActionBarIconSize,
hoverColor: AFThemeExtension.of(context).lightGreyHover,
radius: widget.isInHoverBar
- ? DesktopAIConvoSizes.hoverActionBarIconRadius
- : DesktopAIConvoSizes.actionBarIconRadius,
+ ? DesktopAIChatSizes.messageHoverActionBarIconRadius
+ : DesktopAIChatSizes.messageActionBarIconRadius,
icon: Row(
mainAxisSize: MainAxisSize.min,
children: [
@@ -309,7 +309,7 @@ class _ChangeFormatPopoverContentState
return Container(
padding: const EdgeInsets.all(2.0),
decoration: BoxDecoration(
- borderRadius: DesktopAIConvoSizes.hoverActionBarRadius,
+ borderRadius: DesktopAIChatSizes.messageHoverActionBarRadius,
border: Border.all(
color: isLightMode
? const Color(0x1F1F2329)
@@ -348,8 +348,6 @@ class _ChangeFormatPopoverContentState
children: [
ChangeFormatBar(
spacing: 2.0,
- iconSize: 16.0,
- buttonSize: DesktopAIPromptSizes.predefinedFormatButtonHeight,
predefinedFormat: predefinedFormat,
onSelectPredefinedFormat: (format) {
setState(() => predefinedFormat = format);
@@ -456,11 +454,11 @@ class _SaveToPageButtonState extends State<SaveToPageButton> {
return FlowyTooltip(
message: LocaleKeys.chat_addToPageButton.tr(),
child: FlowyIconButton(
- width: DesktopAIConvoSizes.actionBarIconSize,
+ width: DesktopAIChatSizes.messageActionBarIconSize,
hoverColor: AFThemeExtension.of(context).lightGreyHover,
radius: widget.isInHoverBar
- ? DesktopAIConvoSizes.hoverActionBarIconRadius
- : DesktopAIConvoSizes.actionBarIconRadius,
+ ? DesktopAIChatSizes.messageHoverActionBarIconRadius
+ : DesktopAIChatSizes.messageActionBarIconRadius,
icon: FlowySvg(
FlowySvgs.ai_add_to_page_s,
color: Theme.of(context).hintColor,
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dart
index 1e5598db9e..5362b1c1a4 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_bubble.dart
@@ -20,7 +20,7 @@ import 'package:go_router/go_router.dart';
import 'package:universal_platform/universal_platform.dart';
import '../chat_avatar.dart';
-import '../chat_input/chat_mention_page_bottom_sheet.dart';
+import '../../../../ai/widgets/prompt_input/mention_page_bottom_sheet.dart';
import '../layout_define.dart';
import 'ai_message_action_bar.dart';
import 'ai_change_format_bottom_sheet.dart';
@@ -54,7 +54,7 @@ class ChatAIMessageBubble extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const ChatAIAvatar(),
- const HSpace(DesktopAIConvoSizes.avatarAndChatBubbleSpacing),
+ const HSpace(DesktopAIChatSizes.avatarAndChatBubbleSpacing),
Expanded(child: child),
],
);
@@ -119,8 +119,8 @@ class ChatAIBottomInlineActions extends StatelessWidget {
const VSpace(16.0),
Padding(
padding: const EdgeInsetsDirectional.only(
- start: DesktopAIConvoSizes.avatarSize +
- DesktopAIConvoSizes.avatarAndChatBubbleSpacing,
+ start: DesktopAIChatSizes.avatarSize +
+ DesktopAIChatSizes.avatarAndChatBubbleSpacing,
),
child: AIMessageActionBar(
message: message,
@@ -199,8 +199,8 @@ class _ChatAIMessageHoverState extends State<ChatAIMessageHover> {
link: layerLink,
targetAnchor: Alignment.bottomLeft,
offset: const Offset(
- DesktopAIConvoSizes.avatarSize +
- DesktopAIConvoSizes.avatarAndChatBubbleSpacing,
+ DesktopAIChatSizes.avatarSize +
+ DesktopAIChatSizes.avatarAndChatBubbleSpacing,
0,
),
child: Align(
@@ -220,10 +220,10 @@ class _ChatAIMessageHoverState extends State<ChatAIMessageHover> {
child: Container(
constraints: BoxConstraints(
maxWidth: 784,
- maxHeight: DesktopAIConvoSizes.actionBarIconSize +
- DesktopAIConvoSizes.hoverActionBarPadding.vertical,
+ maxHeight: DesktopAIChatSizes.messageActionBarIconSize +
+ DesktopAIChatSizes
+ .messageHoverActionBarPadding.vertical,
),
- alignment: Alignment.topLeft,
child: hoverBubble || hoverActionBar || overrideVisibility
? AIMessageActionBar(
message: widget.message,
@@ -283,8 +283,8 @@ class _ChatAIMessageHoverState extends State<ChatAIMessageHover> {
return messageOffset.dy +
messageHeight +
- DesktopAIConvoSizes.actionBarIconSize +
- DesktopAIConvoSizes.hoverActionBarPadding.vertical <=
+ DesktopAIChatSizes.messageActionBarIconSize +
+ DesktopAIChatSizes.messageHoverActionBarPadding.vertical <=
scrollableOffset.dy + scrollableHeight;
}
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart
index 41e066c78f..5e9b3674b3 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_text_message.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/ai/widgets/loading_indicator.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_ai_message_bloc.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_bloc.dart';
@@ -15,7 +16,6 @@ import '../layout_define.dart';
import 'ai_markdown_text.dart';
import 'ai_message_bubble.dart';
import 'ai_metadata.dart';
-import 'loading_indicator.dart';
import 'error_text_message.dart';
/// [ChatAIMessageWidget] includes both the text of the AI response as well as
@@ -83,14 +83,14 @@ class ChatAIMessageWidget extends StatelessWidget {
loading: () => ChatAIMessageBubble(
message: message,
showActions: false,
- child: ChatAILoading(text: loadingText),
+ child: AILoadingIndicator(text: loadingText),
),
ready: () {
return state.text.isEmpty
? ChatAIMessageBubble(
message: message,
showActions: false,
- child: ChatAILoading(text: loadingText),
+ child: AILoadingIndicator(text: loadingText),
)
: ChatAIMessageBubble(
message: message,
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart
index 778ca3d0e9..e70f346ecc 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart
@@ -58,13 +58,13 @@ class ChatUserMessageBubble extends StatelessWidget {
return [
const Spacer(),
_buildBubble(context),
- const HSpace(DesktopAIConvoSizes.avatarAndChatBubbleSpacing),
+ const HSpace(DesktopAIChatSizes.avatarAndChatBubbleSpacing),
_buildAvatar(),
];
} else {
return [
_buildAvatar(),
- const HSpace(DesktopAIConvoSizes.avatarAndChatBubbleSpacing),
+ const HSpace(DesktopAIChatSizes.avatarAndChatBubbleSpacing),
_buildBubble(context),
const Spacer(),
];
diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart b/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart
index 5f8d9014b9..bbe671a822 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart
@@ -4,7 +4,7 @@ import 'dart:convert';
import 'package:appflowy/plugins/document/application/document_bloc.dart';
import 'package:appflowy/plugins/document/application/document_data_pb_extension.dart';
import 'package:appflowy/plugins/document/application/document_service.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_component.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/ask_ai_block_component.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-document/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ai_writer_block_component.dart
similarity index 97%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_component.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ai_writer_block_component.dart
index 4e0cb1b8ac..51e8cf0276 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ai_writer_block_component.dart
@@ -1,5 +1,5 @@
-import 'package:appflowy/ai/appflowy_ai_service.dart';
-import 'package:appflowy/ai/error.dart';
+import 'package:appflowy/ai/service/appflowy_ai_service.dart';
+import 'package:appflowy/ai/service/error.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/application/prelude.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/base/build_context_extension.dart';
@@ -15,11 +15,11 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:universal_platform/universal_platform.dart';
-import 'ai_limit_dialog.dart';
-import 'ai_writer_block_operations.dart';
-import 'ai_writer_block_widgets.dart';
-import 'discard_dialog.dart';
-import 'barrier_dialog.dart';
+import 'widgets/ai_limit_dialog.dart';
+import 'widgets/ai_writer_block_operations.dart';
+import 'widgets/ai_writer_block_widgets.dart';
+import 'widgets/discard_dialog.dart';
+import 'widgets/barrier_dialog.dart';
class AIWriterBlockKeys {
const AIWriterBlockKeys._();
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ask_ai_block_component.dart
similarity index 94%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_component.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ask_ai_block_component.dart
index 9fca4e7fa7..df3724f90e 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ask_ai_block_component.dart
@@ -1,13 +1,13 @@
import 'dart:async';
+import 'package:appflowy/ai/service/appflowy_ai_service.dart';
+import 'package:appflowy/ai/service/error.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/ai/ai_client.dart';
-import 'package:appflowy/ai/error.dart';
+import 'package:appflowy/ai/service/ai_client.dart';
import 'package:appflowy/plugins/document/application/document_bloc.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ai_limit_dialog.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action_bloc.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_widgets.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/widgets/ai_limit_dialog.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action_bloc.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_block_widgets.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
@@ -167,7 +167,7 @@ class _AskAIBlockComponentWidgetState extends State<AskAIBlockComponentWidget> {
return BlocProvider.value(
// request the result when opening the popover
value: askAIBloc..add(const AskAIEvent.started()),
- child: const AskAiInputContent(),
+ child: const AskAIInputContent(),
);
},
child: const SizedBox(
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_toolbar_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ask_ai_toolbar_item.dart
similarity index 89%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_toolbar_item.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ask_ai_toolbar_item.dart
index 232b5872a6..723b7f4ffb 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_toolbar_item.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ask_ai_toolbar_item.dart
@@ -1,9 +1,8 @@
+import 'package:appflowy/ai/service/appflowy_ai_service.dart';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/application/document_bloc.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/util/ask_ai_node_extension.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_component.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/util/ask_ai_node_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
@@ -12,6 +11,9 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'widgets/ask_ai_action.dart';
+import 'ask_ai_block_component.dart';
+
const _kAskAIToolbarItemId = 'appflowy.editor.ask_ai';
final ToolbarItem askAIItem = ToolbarItem(
@@ -39,15 +41,14 @@ class AskAIActionList extends StatefulWidget {
}
class _AskAIActionListState extends State<AskAIActionList> {
- bool isAIEnabled = true;
+ late bool isAIEnabled;
EditorState get editorState => widget.editorState;
@override
void initState() {
super.initState();
-
- isAIEnabled = _isAIEnabled();
+ _updateIsAIEnabled();
}
@override
@@ -137,11 +138,9 @@ class _AskAIActionListState extends State<AskAIActionList> {
);
}
- bool _isAIEnabled() {
+ void _updateIsAIEnabled() {
final documentContext = widget.editorState.document.root.context;
- if (documentContext == null) {
- return true;
- }
- return !documentContext.read<DocumentBloc>().isLocalMode;
+ isAIEnabled = documentContext == null ||
+ !documentContext.read<DocumentBloc>().isLocalMode;
}
}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/util/ask_ai_node_extension.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/util/ask_ai_node_extension.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/util/ask_ai_node_extension.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/util/ask_ai_node_extension.dart
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/util/learn_more_action.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/util/learn_more_action.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/util/learn_more_action.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/util/learn_more_action.dart
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_limit_dialog.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ai_limit_dialog.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_limit_dialog.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ai_limit_dialog.dart
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_operations.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ai_writer_block_operations.dart
similarity index 98%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_operations.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ai_writer_block_operations.dart
index 08e242574f..0c2fabfb50 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_operations.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ai_writer_block_operations.dart
@@ -1,4 +1,4 @@
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_component.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/ai_writer_block_component.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
/// Notes: All the operation related to the AI writer block will be applied
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_widgets.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ai_writer_block_widgets.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ai_writer_block_widgets.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ai_writer_block_widgets.dart
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action.dart
new file mode 100644
index 0000000000..dfcec0318e
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action.dart
@@ -0,0 +1,14 @@
+import 'package:appflowy/ai/service/appflowy_ai_service.dart';
+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
+import 'package:flutter/material.dart';
+
+class AskAIActionWrapper extends ActionCell {
+ AskAIActionWrapper(this.inner);
+
+ final AskAIAction inner;
+
+ Widget? icon(Color iconColor) => null;
+
+ @override
+ String get name => inner.name;
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action_bloc.dart
similarity index 96%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action_bloc.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action_bloc.dart
index 75875b9ab0..1fcd8d65ed 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action_bloc.dart
@@ -1,11 +1,10 @@
import 'dart:async';
-import 'package:appflowy/ai/ai_client.dart';
-import 'package:appflowy/ai/error.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart';
+import 'package:appflowy/ai/service/ai_client.dart';
+import 'package:appflowy/ai/service/error.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
import 'package:appflowy/shared/markdown_to_document.dart';
-import 'package:appflowy/ai/appflowy_ai_service.dart';
+import 'package:appflowy/ai/service/appflowy_ai_service.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_widgets.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_block_widgets.dart
similarity index 96%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_widgets.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_block_widgets.dart
index 5c70f774ed..d28f416d1b 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_block_widgets.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_block_widgets.dart
@@ -1,13 +1,13 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/ai_chat/presentation/message/ai_markdown_text.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action_bloc.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-class AskAiInputContent extends StatelessWidget {
- const AskAiInputContent({super.key});
+class AskAIInputContent extends StatelessWidget {
+ const AskAIInputContent({super.key});
@override
Widget build(BuildContext context) {
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/barrier_dialog.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/barrier_dialog.dart
new file mode 100644
index 0000000000..69f453dcfc
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/barrier_dialog.dart
@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+
+class BarrierDialog {
+ BarrierDialog(this.context);
+
+ late BuildContext loadingContext;
+ final BuildContext context;
+
+ void show() => showDialog<void>(
+ context: context,
+ barrierDismissible: false,
+ barrierColor: Colors.transparent,
+ builder: (context) {
+ loadingContext = context;
+ return const SizedBox.shrink();
+ },
+ );
+
+ void dismiss() => Navigator.of(loadingContext).pop();
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/discard_dialog.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/discard_dialog.dart
similarity index 100%
rename from frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/discard_dialog.dart
rename to frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/widgets/discard_dialog.dart
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart
deleted file mode 100644
index d47c26d655..0000000000
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart
+++ /dev/null
@@ -1,77 +0,0 @@
-import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-
-enum AskAIAction {
- summarize,
- fixSpelling,
- improveWriting,
- makeItLonger;
-
- String get toInstruction {
- switch (this) {
- case AskAIAction.summarize:
- return 'Tl;dr';
- case AskAIAction.fixSpelling:
- return 'Correct this to standard English:';
- case AskAIAction.improveWriting:
- return 'Rewrite this in your own words:';
- case AskAIAction.makeItLonger:
- return 'Make this text longer:';
- }
- }
-
- String prompt(String input) {
- switch (this) {
- case AskAIAction.summarize:
- return '$input\n\nTl;dr';
- case AskAIAction.fixSpelling:
- return 'Correct this to standard English:\n\n$input';
- case AskAIAction.improveWriting:
- return 'Rewrite this:\n\n$input';
- case AskAIAction.makeItLonger:
- return 'Make this text longer:\n\n$input';
- }
- }
-
- static AskAIAction from(int index) {
- switch (index) {
- case 0:
- return AskAIAction.summarize;
- case 1:
- return AskAIAction.fixSpelling;
- case 2:
- return AskAIAction.improveWriting;
- case 3:
- return AskAIAction.makeItLonger;
- }
- return AskAIAction.fixSpelling;
- }
-
- String get name {
- switch (this) {
- case AskAIAction.summarize:
- return LocaleKeys.document_plugins_smartEditSummarize.tr();
- case AskAIAction.fixSpelling:
- return LocaleKeys.document_plugins_smartEditFixSpelling.tr();
- case AskAIAction.improveWriting:
- return LocaleKeys.document_plugins_smartEditImproveWriting.tr();
- case AskAIAction.makeItLonger:
- return LocaleKeys.document_plugins_smartEditMakeLonger.tr();
- }
- }
-}
-
-class AskAIActionWrapper extends ActionCell {
- AskAIActionWrapper(this.inner);
-
- final AskAIAction inner;
-
- Widget? icon(Color iconColor) => null;
-
- @override
- String get name {
- return inner.name;
- }
-}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/barrier_dialog.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/barrier_dialog.dart
deleted file mode 100644
index 4b0df658ac..0000000000
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/barrier_dialog.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-
-class BarrierDialog {
- BarrierDialog(this.context);
-
- late BuildContext loadingContext;
- final BuildContext context;
-
- void show() => unawaited(
- showDialog<void>(
- context: context,
- barrierDismissible: false,
- barrierColor: Colors.transparent,
- builder: (BuildContext context) {
- loadingContext = context;
- return const SizedBox.shrink();
- },
- ),
- );
-
- void dismiss() => Navigator.of(loadingContext).pop();
-}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/plugins.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/plugins.dart
index 571ac53bc0..a7d63f2786 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/plugins.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/plugins.dart
@@ -53,9 +53,9 @@ export 'mobile_toolbar_v3/toolbar_item_builder.dart';
export 'mobile_toolbar_v3/undo_redo_toolbar_item.dart';
export 'mobile_toolbar_v3/util.dart';
export 'numbered_list/numbered_list_icon.dart';
-export 'openai/widgets/ai_writer_block_component.dart';
-export 'openai/widgets/ask_ai_block_component.dart';
-export 'openai/widgets/ask_ai_toolbar_item.dart';
+export 'ai/ai_writer_block_component.dart';
+export 'ai/ask_ai_block_component.dart';
+export 'ai/ask_ai_toolbar_item.dart';
export 'outline/outline_block_component.dart';
export 'parsers/document_markdown_parsers.dart';
export 'parsers/markdown_parsers.dart';
diff --git a/frontend/appflowy_flutter/lib/startup/deps_resolver.dart b/frontend/appflowy_flutter/lib/startup/deps_resolver.dart
index df5b3c1473..a0321e7e66 100644
--- a/frontend/appflowy_flutter/lib/startup/deps_resolver.dart
+++ b/frontend/appflowy_flutter/lib/startup/deps_resolver.dart
@@ -3,13 +3,13 @@ import 'package:appflowy/core/network_monitor.dart';
import 'package:appflowy/env/cloud_env.dart';
import 'package:appflowy/plugins/document/application/prelude.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';
-import 'package:appflowy/ai/ai_client.dart';
+import 'package:appflowy/ai/service/ai_client.dart';
import 'package:appflowy/plugins/trash/application/prelude.dart';
import 'package:appflowy/shared/appflowy_cache_manager.dart';
import 'package:appflowy/shared/custom_image_cache_manager.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/startup/tasks/appflowy_cloud_task.dart';
-import 'package:appflowy/ai/appflowy_ai_service.dart';
+import 'package:appflowy/ai/service/appflowy_ai_service.dart';
import 'package:appflowy/user/application/auth/af_cloud_auth_service.dart';
import 'package:appflowy/user/application/auth/auth_service.dart';
import 'package:appflowy/user/application/prelude.dart';
@@ -87,12 +87,8 @@ void _resolveCommonService(
() async {
final result = await UserBackendService.getCurrentUserProfile();
return result.fold(
- (s) {
- return AppFlowyAIService();
- },
- (e) {
- throw Exception('Failed to get user profile: ${e.msg}');
- },
+ (s) => AppFlowyAIService(),
+ (e) => throw Exception('Failed to get user profile: ${e.msg}'),
);
},
);
diff --git a/frontend/appflowy_flutter/test/bloc_test/ask_ai_test/ask_ai_action_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/ask_ai_test/ask_ai_action_bloc_test.dart
index d01f4b6c44..33e2b4c448 100644
--- a/frontend/appflowy_flutter/test/bloc_test/ask_ai_test/ask_ai_action_bloc_test.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/ask_ai_test/ask_ai_action_bloc_test.dart
@@ -1,7 +1,7 @@
-import 'package:appflowy/ai/ai_client.dart';
-import 'package:appflowy/ai/error.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/ask_ai_action_bloc.dart';
+import 'package:appflowy/ai/service/ai_client.dart';
+import 'package:appflowy/ai/service/appflowy_ai_service.dart';
+import 'package:appflowy/ai/service/error.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/widgets/ask_ai_action_bloc.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
import 'package:appflowy_backend/protobuf/flowy-ai/entities.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';