Skip to content

Commit 1b00383

Browse files
fix: 🐛 sendby -> sentby
1 parent 85a9136 commit 1b00383

File tree

11 files changed

+42
-42
lines changed

11 files changed

+42
-42
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ List<Message> messageList = [
7474
id: '1',
7575
message: "Hi",
7676
createdAt: createdAt,
77-
sendBy: userId,
77+
sentBy: userId,
7878
),
7979
Message(
8080
id: '2',
8181
message: "Hello",
8282
createdAt: createdAt,
83-
sendBy: userId,
83+
sentBy: userId,
8484
),
8585
];
8686
```
@@ -92,7 +92,7 @@ void onSendTap(String message, ReplyMessage replyMessage, MessageType messageTyp
9292
id: '3',
9393
message: "How are you",
9494
createdAt: DateTime.now(),
95-
sendBy: currentUser.id,
95+
sentBy: currentUser.id,
9696
replyMessage: replyMessage,
9797
messageType: messageType,
9898
);
@@ -241,10 +241,10 @@ ChatView(
241241
ChatView(
242242
...
243243
swipeToReplyConfig: SwipeToReplyConfiguration(
244-
onLeftSwipe: (message, sendBy){
244+
onLeftSwipe: (message, sentBy){
245245
// Your code goes here
246246
},
247-
onRightSwipe: (message, sendBy){
247+
onRightSwipe: (message, sentBy){
248248
// Your code goes here
249249
},
250250
),
@@ -525,7 +525,7 @@ ChatView(
525525
onReportTap: (Message message) {
526526
debugPrint('Message: $message');
527527
},
528-
onMoreTap: (Message message, bool sendByCurrentUser) {
528+
onMoreTap: (Message message, bool sentByCurrentUser) {
529529
debugPrint('Message : $message');
530530
},
531531
),

example/lib/data.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,57 @@ class Data {
88
id: '1',
99
message: "Hi!",
1010
createdAt: DateTime.now(),
11-
sendBy: '1', // userId of who sends the message
11+
sentBy: '1', // userId of who sends the message
1212
status: MessageStatus.read,
1313
),
1414
Message(
1515
id: '2',
1616
message: "Hi!",
1717
createdAt: DateTime.now(),
18-
sendBy: '2',
18+
sentBy: '2',
1919
status: MessageStatus.read,
2020
),
2121
Message(
2222
id: '3',
2323
message: "We can meet?I am free",
2424
createdAt: DateTime.now(),
25-
sendBy: '1',
25+
sentBy: '1',
2626
status: MessageStatus.read,
2727
),
2828
Message(
2929
id: '4',
3030
message: "Can you write the time and place of the meeting?",
3131
createdAt: DateTime.now(),
32-
sendBy: '1',
32+
sentBy: '1',
3333
status: MessageStatus.read,
3434
),
3535
Message(
3636
id: '5',
3737
message: "That's fine",
3838
createdAt: DateTime.now(),
39-
sendBy: '2',
39+
sentBy: '2',
4040
reaction: Reaction(reactions: ['\u{2764}'], reactedUserIds: ['1']),
4141
status: MessageStatus.read,
4242
),
4343
Message(
4444
id: '6',
4545
message: "When to go ?",
4646
createdAt: DateTime.now(),
47-
sendBy: '3',
47+
sentBy: '3',
4848
status: MessageStatus.read,
4949
),
5050
Message(
5151
id: '7',
5252
message: "I guess Simform will reply",
5353
createdAt: DateTime.now(),
54-
sendBy: '4',
54+
sentBy: '4',
5555
status: MessageStatus.read,
5656
),
5757
Message(
5858
id: '8',
5959
message: "https://bit.ly/3JHS2Wl",
6060
createdAt: DateTime.now(),
61-
sendBy: '2',
61+
sentBy: '2',
6262
reaction: Reaction(
6363
reactions: ['\u{2764}', '\u{1F44D}', '\u{1F44D}'],
6464
reactedUserIds: ['2', '3', '4'],
@@ -75,7 +75,7 @@ class Data {
7575
id: '9',
7676
message: "Done",
7777
createdAt: DateTime.now(),
78-
sendBy: '1',
78+
sentBy: '1',
7979
status: MessageStatus.read,
8080
reaction: Reaction(
8181
reactions: [
@@ -91,7 +91,7 @@ class Data {
9191
message: "Thank you!!",
9292
status: MessageStatus.read,
9393
createdAt: DateTime.now(),
94-
sendBy: '1',
94+
sentBy: '1',
9595
reaction: Reaction(
9696
reactions: ['\u{2764}', '\u{2764}', '\u{2764}', '\u{2764}'],
9797
reactedUserIds: ['2', '4', '3', '1'],
@@ -102,15 +102,15 @@ class Data {
102102
message: "https://miro.medium.com/max/1000/0*s7of7kWnf9fDg4XM.jpeg",
103103
createdAt: DateTime.now(),
104104
messageType: MessageType.image,
105-
sendBy: '1',
105+
sentBy: '1',
106106
reaction: Reaction(reactions: ['\u{2764}'], reactedUserIds: ['2']),
107107
status: MessageStatus.read,
108108
),
109109
Message(
110110
id: '12',
111111
message: "🤩🤩",
112112
createdAt: DateTime.now(),
113-
sendBy: '2',
113+
sentBy: '2',
114114
status: MessageStatus.read,
115115
),
116116
];

example/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ class _ChatScreenState extends State<ChatScreen> {
274274
id: id.toString(),
275275
createdAt: DateTime.now(),
276276
message: message,
277-
sendBy: _chatController.currentUser.id,
277+
sentBy: _chatController.currentUser.id,
278278
replyMessage: replyMessage,
279279
messageType: messageType,
280280
),

lib/src/controller/chat_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class ChatController {
106106
id: messageId,
107107
message: message.message,
108108
createdAt: message.createdAt,
109-
sendBy: message.sendBy,
109+
sentBy: message.sentBy,
110110
replyMessage: message.replyMessage,
111111
reaction: message.reaction,
112112
messageType: message.messageType,

lib/src/models/message.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Message {
3737
final DateTime createdAt;
3838

3939
/// Provides id of sender of message.
40-
final String sendBy;
40+
final String sentBy;
4141

4242
/// Provides reply message if user triggers any reply on any message.
4343
final ReplyMessage replyMessage;
@@ -58,7 +58,7 @@ class Message {
5858
this.id = '',
5959
required this.message,
6060
required this.createdAt,
61-
required this.sendBy,
61+
required this.sentBy,
6262
this.replyMessage = const ReplyMessage(),
6363
Reaction? reaction,
6464
this.messageType = MessageType.text,
@@ -95,7 +95,7 @@ class Message {
9595
message: json['message']?.toString() ?? '',
9696
createdAt:
9797
DateTime.tryParse(json['createdAt'].toString()) ?? DateTime.now(),
98-
sendBy: json['sendBy']?.toString() ?? '',
98+
sentBy: json['sentBy']?.toString() ?? '',
9999
replyMessage: json['reply_message'] is Map<String, dynamic>
100100
? ReplyMessage.fromJson(json['reply_message'])
101101
: const ReplyMessage(),
@@ -116,7 +116,7 @@ class Message {
116116
'id': id,
117117
'message': message,
118118
'createdAt': createdAt.toIso8601String(),
119-
'sendBy': sendBy,
119+
'sentBy': sentBy,
120120
'reply_message': replyMessage.toJson(),
121121
'reaction': reaction.toJson(),
122122
'message_type': messageType.name,
@@ -129,7 +129,7 @@ class Message {
129129
GlobalKey? key,
130130
String? message,
131131
DateTime? createdAt,
132-
String? sendBy,
132+
String? sentBy,
133133
ReplyMessage? replyMessage,
134134
Reaction? reaction,
135135
MessageType? messageType,
@@ -141,7 +141,7 @@ class Message {
141141
id: id ?? this.message,
142142
message: message ?? this.message,
143143
createdAt: createdAt ?? this.createdAt,
144-
sendBy: sendBy ?? this.sendBy,
144+
sentBy: sentBy ?? this.sentBy,
145145
messageType: messageType ?? this.messageType,
146146
voiceMessageDuration: forceNullValue
147147
? voiceMessageDuration

lib/src/models/reply_popup_configuration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ReplyPopupConfiguration {
2929
final Color? backgroundColor;
3030

3131
/// Provides builder for creating reply pop-up widget.
32-
final Widget Function(Message message, bool sendByCurrentUser)?
32+
final Widget Function(Message message, bool sentByCurrentUser)?
3333
replyPopupBuilder;
3434

3535
/// Provides callback on unSend button.

lib/src/values/typedefs.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ typedef StringWithReturnWidget = Widget Function(String separator);
4242
typedef DragUpdateDetailsCallback = void Function(DragUpdateDetails);
4343
typedef MoreTapCallBack = void Function(
4444
Message message,
45-
bool sendByCurrentUser,
45+
bool sentByCurrentUser,
4646
);
4747
typedef ReactionCallback = void Function(
4848
Message message,

lib/src/widgets/chat_bubble_widget.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ class ChatBubbleWidget extends StatefulWidget {
107107
class _ChatBubbleWidgetState extends State<ChatBubbleWidget> {
108108
String get replyMessage => widget.message.replyMessage.message;
109109

110-
bool get isMessageBySender => widget.message.sendBy == currentUser?.id;
110+
bool get isMessageBySender => widget.message.sentBy == currentUser?.id;
111111

112112
bool get isMessageBySameSenderAsPrevious =>
113-
widget.previousMessage?.sendBy == widget.message.sendBy;
113+
widget.previousMessage?.sentBy == widget.message.sentBy;
114114

115115
bool get isMessageLastFromSender =>
116-
widget.nextMessage?.sendBy == widget.message.sendBy;
116+
widget.nextMessage?.sentBy == widget.message.sentBy;
117117

118118
bool get isLastMessage =>
119119
chatController?.initialMessageList.last.id == widget.message.id;
@@ -144,7 +144,7 @@ class _ChatBubbleWidgetState extends State<ChatBubbleWidget> {
144144
@override
145145
Widget build(BuildContext context) {
146146
// Get user from id.
147-
final messagedUser = chatController?.getUserFromId(widget.message.sendBy);
147+
final messagedUser = chatController?.getUserFromId(widget.message.sentBy);
148148
return Stack(
149149
children: [
150150
if (swipeLeftShouldShowTime && widget.slideValue != null) ...[

lib/src/widgets/chat_list_widget.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class _ChatListWidgetState extends State<ChatListWidget>
220220
if (featureActiveConfig?.enableReplySnackBar ?? false) {
221221
_showReplyPopup(
222222
message: message,
223-
sendByCurrentUser: message.sendBy == currentUser?.id,
223+
sentByCurrentUser: message.sentBy == currentUser?.id,
224224
);
225225
}
226226
},
@@ -257,7 +257,7 @@ class _ChatListWidgetState extends State<ChatListWidget>
257257

258258
void _showReplyPopup({
259259
required Message message,
260-
required bool sendByCurrentUser,
260+
required bool sentByCurrentUser,
261261
}) {
262262
final replyPopup = widget.replyPopupConfig;
263263
ScaffoldMessenger.of(context)
@@ -266,15 +266,15 @@ class _ChatListWidgetState extends State<ChatListWidget>
266266
duration: const Duration(hours: 1),
267267
backgroundColor: replyPopup?.backgroundColor ?? Colors.white,
268268
content: replyPopup?.replyPopupBuilder != null
269-
? replyPopup!.replyPopupBuilder!(message, sendByCurrentUser)
269+
? replyPopup!.replyPopupBuilder!(message, sentByCurrentUser)
270270
: ReplyPopupWidget(
271271
buttonTextStyle: replyPopup?.buttonTextStyle,
272272
topBorderColor: replyPopup?.topBorderColor,
273273
onMoreTap: () {
274274
_onChatListTap();
275275
replyPopup?.onMoreTap?.call(
276276
message,
277-
sendByCurrentUser,
277+
sentByCurrentUser,
278278
);
279279
},
280280
onReportTap: () {
@@ -299,7 +299,7 @@ class _ChatListWidgetState extends State<ChatListWidget>
299299
replyPopup?.onReplyTap!(message);
300300
}
301301
},
302-
sendByCurrentUser: sendByCurrentUser,
302+
sentByCurrentUser: sentByCurrentUser,
303303
),
304304
padding: EdgeInsets.zero,
305305
),

lib/src/widgets/reply_popup_widget.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import '../values/typedefs.dart';
2828
class ReplyPopupWidget extends StatelessWidget {
2929
const ReplyPopupWidget({
3030
Key? key,
31-
required this.sendByCurrentUser,
31+
required this.sentByCurrentUser,
3232
required this.onUnsendTap,
3333
required this.onReplyTap,
3434
required this.onReportTap,
@@ -38,7 +38,7 @@ class ReplyPopupWidget extends StatelessWidget {
3838
}) : super(key: key);
3939

4040
/// Represents message is sent by current user or not.
41-
final bool sendByCurrentUser;
41+
final bool sentByCurrentUser;
4242

4343
/// Provides call back when user tap on unsend button.
4444
final VoidCallBack onUnsendTap;
@@ -82,7 +82,7 @@ class ReplyPopupWidget extends StatelessWidget {
8282
),
8383
),
8484
),
85-
if (sendByCurrentUser)
85+
if (sentByCurrentUser)
8686
Expanded(
8787
child: InkWell(
8888
onTap: onUnsendTap,
@@ -93,7 +93,7 @@ class ReplyPopupWidget extends StatelessWidget {
9393
),
9494
),
9595
),
96-
if (!sendByCurrentUser)
96+
if (!sentByCurrentUser)
9797
Expanded(
9898
child: InkWell(
9999
onTap: onReportTap,

0 commit comments

Comments
 (0)