Skip to content

Commit 104a208

Browse files
Mugunthan-RamalingamMugunthan-Ramalingam
committed
FLUT-931209-[others]: updated chat source cahgnes
1 parent 08111da commit 104a208

File tree

8 files changed

+215
-49
lines changed

8 files changed

+215
-49
lines changed

‎packages/syncfusion_flutter_chat/example/lib/main.dart‎

Lines changed: 124 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:syncfusion_flutter_chat/chat.dart';
3+
import 'package:syncfusion_flutter_chat/assist_view.dart';
34

45
void main() {
56
runApp(const MaterialApp(
@@ -8,21 +9,75 @@ void main() {
89
));
910
}
1011

11-
class MainApp extends StatefulWidget {
12+
class MainApp extends StatelessWidget {
1213
const MainApp({super.key});
1314

1415
@override
15-
State<MainApp> createState() => _MainAppState();
16+
Widget build(BuildContext context) {
17+
return Scaffold(
18+
appBar: AppBar(
19+
title: const Text('Syncfusion Conversational UI Sample'),
20+
),
21+
body: Center(
22+
child: Column(
23+
mainAxisAlignment: MainAxisAlignment.center,
24+
children: [
25+
Padding(
26+
padding: const EdgeInsets.only(bottom: 20),
27+
child: ElevatedButton(
28+
onPressed: () {
29+
Navigator.push(
30+
context,
31+
MaterialPageRoute(
32+
builder: (BuildContext context) => const ChatSample(),
33+
),
34+
);
35+
},
36+
child: const Text('Chat Sample'),
37+
),
38+
),
39+
ElevatedButton(
40+
onPressed: () {
41+
Navigator.push(
42+
context,
43+
MaterialPageRoute(
44+
builder: (BuildContext context) => const AssistViewSample(),
45+
),
46+
);
47+
},
48+
child: const Text('AI AssistView Sample'),
49+
),
50+
],
51+
),
52+
),
53+
);
54+
}
55+
}
56+
57+
// Chat Sample
58+
class ChatSample extends StatefulWidget {
59+
const ChatSample({super.key});
60+
61+
@override
62+
State<ChatSample> createState() => ChatSampleState();
1663
}
1764

18-
class _MainAppState extends State<MainApp> {
65+
class ChatSampleState extends State<ChatSample> {
1966
late List<ChatMessage> _messages;
2067

2168
@override
2269
void initState() {
2370
_messages = <ChatMessage>[
2471
ChatMessage(
25-
text: 'Hello, how can I help you today?',
72+
text: 'Hi! How are you?',
73+
time: DateTime.now(),
74+
author: const ChatAuthor(
75+
id: '8ob3-b720-g9s6-25s8',
76+
name: 'Outgoing user name',
77+
),
78+
),
79+
ChatMessage(
80+
text: 'Fine, how about you?',
2681
time: DateTime.now(),
2782
author: const ChatAuthor(
2883
id: 'a2c4-56h8-9x01-2a3d',
@@ -74,3 +129,68 @@ class _MainAppState extends State<MainApp> {
74129
super.dispose();
75130
}
76131
}
132+
133+
// AssistView Sample
134+
class AssistViewSample extends StatefulWidget {
135+
const AssistViewSample({super.key});
136+
137+
@override
138+
State<AssistViewSample> createState() => AssistViewSampleState();
139+
}
140+
141+
class AssistViewSampleState extends State<AssistViewSample> {
142+
late List<AssistMessage> _messages;
143+
144+
void _generativeResponse(String data) async {
145+
final String response = await _getAIResponse(data);
146+
setState(() {
147+
_messages.add(AssistMessage.response(data: response));
148+
});
149+
}
150+
151+
Future<String> _getAIResponse(String data) async {
152+
String response = '';
153+
// Connect with your preferred AI to generate a response to the request.
154+
return response;
155+
}
156+
157+
@override
158+
void initState() {
159+
_messages = <AssistMessage>[];
160+
super.initState();
161+
}
162+
163+
@override
164+
Widget build(BuildContext context) {
165+
return Scaffold(
166+
appBar: AppBar(
167+
title: const Text('Syncfusion Flutter AI AssistView'),
168+
),
169+
body: Padding(
170+
padding: const EdgeInsets.all(10.0),
171+
child: SfAIAssistView(
172+
messages: _messages,
173+
composer: const AssistComposer(
174+
decoration: InputDecoration(
175+
hintText: 'Type a message',
176+
),
177+
),
178+
actionButton: AssistActionButton(
179+
onPressed: (String data) {
180+
setState(() {
181+
_messages.add(AssistMessage.request(data: data));
182+
_generativeResponse(data);
183+
});
184+
},
185+
),
186+
),
187+
),
188+
);
189+
}
190+
191+
@override
192+
void dispose() {
193+
_messages.clear();
194+
super.dispose();
195+
}
196+
}

‎packages/syncfusion_flutter_chat/lib/src/assist_view/assist_view.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,14 +595,14 @@ class _SfAIAssistViewState extends State<SfAIAssistView> {
595595
const AssistBubbleSettings(
596596
avatarPadding: EdgeInsetsDirectional.only(start: 16.0),
597597
contentPadding: EdgeInsets.all(8.0),
598-
padding: EdgeInsetsDirectional.only(bottom: 24.0),
598+
padding: EdgeInsetsDirectional.only(top: 24.0),
599599
showUserAvatar: true,
600600
);
601601
final AssistBubbleSettings _responseBubbleSettings =
602602
const AssistBubbleSettings(
603603
avatarPadding: EdgeInsetsDirectional.only(end: 16.0),
604604
contentPadding: EdgeInsetsDirectional.symmetric(vertical: 8.0),
605-
padding: EdgeInsetsDirectional.only(bottom: 24.0),
605+
padding: EdgeInsetsDirectional.only(top: 24.0),
606606
showUserAvatar: true,
607607
);
608608
final InputBorder _defaultInputDecorBorder = const OutlineInputBorder(

‎packages/syncfusion_flutter_chat/lib/src/assist_view/conversion_area.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ class _AssistMessageBubbleState extends MessageBubbleState<AssistMessage> {
490490
midColor = Colors.white;
491491
} else {
492492
edgeColor = colorScheme.surfaceContainer;
493-
midColor = colorScheme.surfaceContainer.withOpacity(0.12);
493+
midColor = colorScheme.surfaceContainer.withValues(alpha: 0.12);
494494
}
495495
return _Shimmer(
496496
bubbleWidth: availableContentWidth() * widget.widthFactor,

‎packages/syncfusion_flutter_chat/lib/src/assist_view/theme.dart‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Color _saturatedColor(Color color, double factor) {
88
const Color mix = Color(0x4D000000);
99
final double mixFactor = 1 - factor;
1010
return Color.fromRGBO(
11-
(mixFactor * color.red + factor * mix.red).toInt(),
12-
(mixFactor * color.green + factor * mix.green).toInt(),
13-
(mixFactor * color.blue + factor * mix.blue).toInt(),
11+
(mixFactor * (color.r * 255) + factor * (mix.r * 255)).toInt(),
12+
(mixFactor * (color.g * 255) + factor * (mix.g * 255)).toInt(),
13+
(mixFactor * (color.b * 255) + factor * (mix.b * 255)).toInt(),
1414
1,
1515
);
1616
}
@@ -40,21 +40,24 @@ class AIAssistViewM2ThemeData extends SfAIAssistViewThemeData {
4040
Color? get actionButtonBackgroundColor => _colorScheme.primary;
4141

4242
@override
43-
Color? get actionButtonFocusColor => _colorScheme.primary.withOpacity(0.86);
43+
Color? get actionButtonFocusColor =>
44+
_colorScheme.primary.withValues(alpha: 0.86);
4445

4546
@override
46-
Color? get actionButtonHoverColor => _colorScheme.primary.withOpacity(0.91);
47+
Color? get actionButtonHoverColor =>
48+
_colorScheme.primary.withValues(alpha: 0.91);
4749

4850
@override
49-
Color? get actionButtonSplashColor => _colorScheme.primary.withOpacity(0.86);
51+
Color? get actionButtonSplashColor =>
52+
_colorScheme.primary.withValues(alpha: 0.86);
5053

5154
@override
5255
Color? get actionButtonDisabledForegroundColor =>
53-
_colorScheme.onSurface.withOpacity(0.38);
56+
_colorScheme.onSurface.withValues(alpha: 0.38);
5457

5558
@override
5659
Color? get actionButtonDisabledBackgroundColor =>
57-
_colorScheme.surface.withOpacity(0.12);
60+
_colorScheme.surface.withValues(alpha: 0.12);
5861

5962
@override
6063
ShapeBorder? get actionButtonShape => const RoundedRectangleBorder(
@@ -103,11 +106,11 @@ class AIAssistViewM2ThemeData extends SfAIAssistViewThemeData {
103106
(Set<WidgetState> states) {
104107
if (states.contains(WidgetState.hovered) ||
105108
states.contains(WidgetState.focused)) {
106-
return _colorScheme.onSurface.withOpacity(0.08);
109+
return _colorScheme.onSurface.withValues(alpha: 0.08);
107110
}
108111
if (states.contains(WidgetState.pressed) ||
109112
states.contains(WidgetState.selected)) {
110-
return _colorScheme.onSurface.withOpacity(0.01);
113+
return _colorScheme.onSurface.withValues(alpha: 0.01);
111114
}
112115
return _colorScheme.surface;
113116
},
@@ -127,7 +130,7 @@ class AIAssistViewM2ThemeData extends SfAIAssistViewThemeData {
127130
(Set<WidgetState> states) {
128131
if (states.contains(WidgetState.disabled)) {
129132
return TextStyle(
130-
color: _colorScheme.onSurface.withOpacity(0.38),
133+
color: _colorScheme.onSurface.withValues(alpha: 0.38),
131134
);
132135
}
133136
return TextStyle(color: _colorScheme.onSurface);
@@ -159,21 +162,24 @@ class AIAssistViewM3ThemeData extends SfAIAssistViewThemeData {
159162
Color? get actionButtonBackgroundColor => _colorScheme.primary;
160163

161164
@override
162-
Color? get actionButtonFocusColor => _colorScheme.primary.withOpacity(0.86);
165+
Color? get actionButtonFocusColor =>
166+
_colorScheme.primary.withValues(alpha: 0.86);
163167

164168
@override
165-
Color? get actionButtonHoverColor => _colorScheme.primary.withOpacity(0.91);
169+
Color? get actionButtonHoverColor =>
170+
_colorScheme.primary.withValues(alpha: 0.91);
166171

167172
@override
168-
Color? get actionButtonSplashColor => _colorScheme.primary.withOpacity(0.86);
173+
Color? get actionButtonSplashColor =>
174+
_colorScheme.primary.withValues(alpha: 0.86);
169175

170176
@override
171177
Color? get actionButtonDisabledForegroundColor =>
172-
_colorScheme.onSurface.withOpacity(0.38);
178+
_colorScheme.onSurface.withValues(alpha: 0.38);
173179

174180
@override
175181
Color? get actionButtonDisabledBackgroundColor =>
176-
_colorScheme.surface.withOpacity(0.12);
182+
_colorScheme.surface.withValues(alpha: 0.12);
177183

178184
@override
179185
ShapeBorder? get actionButtonShape => const RoundedRectangleBorder(
@@ -222,11 +228,11 @@ class AIAssistViewM3ThemeData extends SfAIAssistViewThemeData {
222228
(Set<WidgetState> states) {
223229
if (states.contains(WidgetState.hovered) ||
224230
states.contains(WidgetState.focused)) {
225-
return _colorScheme.onSurface.withOpacity(0.08);
231+
return _colorScheme.onSurface.withValues(alpha: 0.08);
226232
}
227233
if (states.contains(WidgetState.pressed) ||
228234
states.contains(WidgetState.selected)) {
229-
return _colorScheme.onSurface.withOpacity(0.01);
235+
return _colorScheme.onSurface.withValues(alpha: 0.01);
230236
}
231237
return _colorScheme.surface;
232238
},
@@ -246,7 +252,7 @@ class AIAssistViewM3ThemeData extends SfAIAssistViewThemeData {
246252
(Set<WidgetState> states) {
247253
if (states.contains(WidgetState.disabled)) {
248254
return TextStyle(
249-
color: _colorScheme.onSurface.withOpacity(0.38),
255+
color: _colorScheme.onSurface.withValues(alpha: 0.38),
250256
);
251257
}
252258
return TextStyle(color: _colorScheme.onSurface);

‎packages/syncfusion_flutter_chat/lib/src/chat/conversion_area.dart‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class _ChatConversationAreaState extends ConversationAreaState<ChatMessage> {
116116
index: index,
117117
maxWidth: width,
118118
widthFactor: settings.widthFactor,
119+
messages: widget.messages,
119120
message: message,
120121
isOutgoing: isFromCurrentUser,
121122
isFirstInGroup: isLeadMessage,
@@ -182,6 +183,7 @@ class _ChatMessageBubble extends MessageBubble<ChatMessage> {
182183
required super.index,
183184
required super.maxWidth,
184185
super.widthFactor = 0.8,
186+
required this.messages,
185187
required super.message,
186188
required super.isOutgoing,
187189
required super.isFirstInGroup,
@@ -218,7 +220,7 @@ class _ChatMessageBubble extends MessageBubble<ChatMessage> {
218220
required super.textDirection,
219221
required super.alignmentDirection,
220222
});
221-
223+
final List<ChatMessage> messages;
222224
final ChatSuggestionItemSelectedCallback? onSuggestionItemSelected;
223225

224226
@override
@@ -229,6 +231,35 @@ class _ChatMessageBubbleState extends MessageBubbleState<ChatMessage> {
229231
@override
230232
_ChatMessageBubble get widget => super.widget as _ChatMessageBubble;
231233

234+
@override
235+
EdgeInsets effectiveMessagePadding() {
236+
final int messageCount = widget.messages.length;
237+
final ChatMessage current = widget.message;
238+
final ChatMessage? previous =
239+
widget.index - 1 >= 0 ? widget.messages[widget.index - 1] : null;
240+
final ChatMessage? next = widget.index + 1 < messageCount
241+
? widget.messages[widget.index + 1]
242+
: null;
243+
244+
final EdgeInsets padding = super.effectiveMessagePadding();
245+
double top = padding.top;
246+
double bottom = padding.bottom;
247+
if (previous != null && current.author.id == previous.author.id) {
248+
top = 2.0;
249+
}
250+
251+
if (next != null && current.author.id == next.author.id) {
252+
bottom = 2.0;
253+
}
254+
255+
return EdgeInsets.only(
256+
top: top,
257+
bottom: bottom,
258+
left: padding.left,
259+
right: padding.right,
260+
);
261+
}
262+
232263
@override
233264
Widget? buildDefaultHeader() {
234265
final bool canAddSpace = widget.showUserName && widget.showTimestamp;

‎packages/syncfusion_flutter_chat/lib/src/chat/settings.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ class ChatBubbleSettings extends MessageSettings {
880880
this.contentShape,
881881
this.widthFactor = 0.8,
882882
this.avatarSize = const Size.square(32.0),
883-
this.padding = const EdgeInsets.symmetric(vertical: 8.0),
883+
this.padding = const EdgeInsetsDirectional.only(top: 16.0),
884884
this.contentPadding =
885885
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
886886
this.avatarPadding,

0 commit comments

Comments
 (0)