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(flutter): move other user message to end (#7413)

Richard Shiue63239893abf1
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 650840e019..ee39fb8adc 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
@@ -195,7 +195,6 @@ class _ChatContentPage extends StatelessWidget {
return ChatUserMessageWidget(
user: message.author,
message: message,
- isCurrentUser: true,
);
}
@@ -203,7 +202,6 @@ class _ChatContentPage extends StatelessWidget {
return ChatUserMessageWidget(
user: message.author,
message: message,
- isCurrentUser: false,
);
}
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 e70f346ecc..81aab4d555 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
@@ -15,13 +15,11 @@ class ChatUserMessageBubble extends StatelessWidget {
super.key,
required this.message,
required this.child,
- required this.isCurrentUser,
this.files = const [],
});
final Message message;
final Widget child;
- final bool isCurrentUser;
final List<ChatFile> files;
@override
@@ -46,31 +44,18 @@ class ChatUserMessageBubble extends StatelessWidget {
Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
- children: getChildren(context),
+ children: [
+ const Spacer(),
+ _buildBubble(context),
+ const HSpace(DesktopAIChatSizes.avatarAndChatBubbleSpacing),
+ _buildAvatar(),
+ ],
),
],
),
);
}
- List<Widget> getChildren(BuildContext context) {
- if (isCurrentUser) {
- return [
- const Spacer(),
- _buildBubble(context),
- const HSpace(DesktopAIChatSizes.avatarAndChatBubbleSpacing),
- _buildAvatar(),
- ];
- } else {
- return [
- _buildAvatar(),
- const HSpace(DesktopAIChatSizes.avatarAndChatBubbleSpacing),
- _buildBubble(context),
- const Spacer(),
- ];
- }
- }
-
Widget _buildAvatar() {
return BlocBuilder<ChatMemberBloc, ChatMemberState>(
builder: (context, state) {
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_text_message.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_text_message.dart
index 3638ace12f..c73100b59d 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_text_message.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_text_message.dart
@@ -15,12 +15,10 @@ class ChatUserMessageWidget extends StatelessWidget {
super.key,
required this.user,
required this.message,
- required this.isCurrentUser,
});
final User user;
final TextMessage message;
- final bool isCurrentUser;
@override
Widget build(BuildContext context) {
@@ -34,7 +32,6 @@ class ChatUserMessageWidget extends StatelessWidget {
),
child: ChatUserMessageBubble(
message: message,
- isCurrentUser: isCurrentUser,
files: _getFiles(),
child: BlocBuilder<ChatUserMessageBloc, ChatUserMessageState>(
builder: (context, state) {