From 464df89c45519cce3ef6e65b65a2137f78e9fd05 Mon Sep 17 00:00:00 2001 From: Alex Demchenko Date: Wed, 3 Aug 2022 23:37:06 +0200 Subject: [PATCH] Fixes after PR --- CHANGELOG.md | 5 +++++ example/pubspec.yaml | 2 +- lib/src/message.dart | 2 +- lib/src/messages/custom_message.g.dart | 4 ++-- lib/src/messages/file_message.g.dart | 4 ++-- lib/src/messages/image_message.g.dart | 4 ++-- lib/src/messages/system_message.g.dart | 4 ++-- lib/src/messages/text_message.g.dart | 4 ++-- lib/src/messages/unsupported_message.g.dart | 4 ++-- pubspec.yaml | 10 +++++----- 10 files changed, 24 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 232cbbd..f7b3b53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.4.4 + +- Add system message type. Thanks @felixgabler for the PR! +- Update dependencies + ## 3.4.3 - Code refactor diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 99944f5..98e65c3 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -5,5 +5,5 @@ dependencies: flutter_chat_types: path: .. dev_dependencies: - dart_code_metrics: ^4.15.2 + dart_code_metrics: ^4.17.0 flutter_lints: ^2.0.1 diff --git a/lib/src/message.dart b/lib/src/message.dart index 6c72974..3f717a8 100644 --- a/lib/src/message.dart +++ b/lib/src/message.dart @@ -10,7 +10,7 @@ import 'messages/unsupported_message.dart'; import 'user.dart' show User; /// All possible message types. -enum MessageType { custom, file, image, text, system, unsupported } +enum MessageType { custom, file, image, system, text, unsupported } /// All possible statuses message can have. enum Status { delivered, error, seen, sending, sent } diff --git a/lib/src/messages/custom_message.g.dart b/lib/src/messages/custom_message.g.dart index eabf089..d21805e 100644 --- a/lib/src/messages/custom_message.g.dart +++ b/lib/src/messages/custom_message.g.dart @@ -42,7 +42,7 @@ Map _$CustomMessageToJson(CustomMessage instance) { writeNotNull('roomId', instance.roomId); writeNotNull('showStatus', instance.showStatus); writeNotNull('status', _$StatusEnumMap[instance.status]); - val['type'] = _$MessageTypeEnumMap[instance.type]; + val['type'] = _$MessageTypeEnumMap[instance.type]!; writeNotNull('updatedAt', instance.updatedAt); return val; } @@ -59,7 +59,7 @@ const _$MessageTypeEnumMap = { MessageType.custom: 'custom', MessageType.file: 'file', MessageType.image: 'image', - MessageType.text: 'text', MessageType.system: 'system', + MessageType.text: 'text', MessageType.unsupported: 'unsupported', }; diff --git a/lib/src/messages/file_message.g.dart b/lib/src/messages/file_message.g.dart index d9b5ec7..8ed4401 100644 --- a/lib/src/messages/file_message.g.dart +++ b/lib/src/messages/file_message.g.dart @@ -46,7 +46,7 @@ Map _$FileMessageToJson(FileMessage instance) { writeNotNull('roomId', instance.roomId); writeNotNull('showStatus', instance.showStatus); writeNotNull('status', _$StatusEnumMap[instance.status]); - val['type'] = _$MessageTypeEnumMap[instance.type]; + val['type'] = _$MessageTypeEnumMap[instance.type]!; writeNotNull('updatedAt', instance.updatedAt); writeNotNull('isLoading', instance.isLoading); writeNotNull('mimeType', instance.mimeType); @@ -68,7 +68,7 @@ const _$MessageTypeEnumMap = { MessageType.custom: 'custom', MessageType.file: 'file', MessageType.image: 'image', - MessageType.text: 'text', MessageType.system: 'system', + MessageType.text: 'text', MessageType.unsupported: 'unsupported', }; diff --git a/lib/src/messages/image_message.g.dart b/lib/src/messages/image_message.g.dart index 116e3c5..a030d51 100644 --- a/lib/src/messages/image_message.g.dart +++ b/lib/src/messages/image_message.g.dart @@ -46,7 +46,7 @@ Map _$ImageMessageToJson(ImageMessage instance) { writeNotNull('roomId', instance.roomId); writeNotNull('showStatus', instance.showStatus); writeNotNull('status', _$StatusEnumMap[instance.status]); - val['type'] = _$MessageTypeEnumMap[instance.type]; + val['type'] = _$MessageTypeEnumMap[instance.type]!; writeNotNull('updatedAt', instance.updatedAt); writeNotNull('height', instance.height); val['name'] = instance.name; @@ -68,7 +68,7 @@ const _$MessageTypeEnumMap = { MessageType.custom: 'custom', MessageType.file: 'file', MessageType.image: 'image', - MessageType.text: 'text', MessageType.system: 'system', + MessageType.text: 'text', MessageType.unsupported: 'unsupported', }; diff --git a/lib/src/messages/system_message.g.dart b/lib/src/messages/system_message.g.dart index 6849c66..49ba0df 100644 --- a/lib/src/messages/system_message.g.dart +++ b/lib/src/messages/system_message.g.dart @@ -42,7 +42,7 @@ Map _$SystemMessageToJson(SystemMessage instance) { writeNotNull('roomId', instance.roomId); writeNotNull('showStatus', instance.showStatus); writeNotNull('status', _$StatusEnumMap[instance.status]); - val['type'] = _$MessageTypeEnumMap[instance.type]; + val['type'] = _$MessageTypeEnumMap[instance.type]!; writeNotNull('updatedAt', instance.updatedAt); return val; } @@ -59,7 +59,7 @@ const _$MessageTypeEnumMap = { MessageType.custom: 'custom', MessageType.file: 'file', MessageType.image: 'image', - MessageType.text: 'text', MessageType.system: 'system', + MessageType.text: 'text', MessageType.unsupported: 'unsupported', }; diff --git a/lib/src/messages/text_message.g.dart b/lib/src/messages/text_message.g.dart index 00ab941..2a460bd 100644 --- a/lib/src/messages/text_message.g.dart +++ b/lib/src/messages/text_message.g.dart @@ -45,7 +45,7 @@ Map _$TextMessageToJson(TextMessage instance) { writeNotNull('roomId', instance.roomId); writeNotNull('showStatus', instance.showStatus); writeNotNull('status', _$StatusEnumMap[instance.status]); - val['type'] = _$MessageTypeEnumMap[instance.type]; + val['type'] = _$MessageTypeEnumMap[instance.type]!; writeNotNull('updatedAt', instance.updatedAt); writeNotNull('previewData', instance.previewData?.toJson()); val['text'] = instance.text; @@ -64,7 +64,7 @@ const _$MessageTypeEnumMap = { MessageType.custom: 'custom', MessageType.file: 'file', MessageType.image: 'image', - MessageType.text: 'text', MessageType.system: 'system', + MessageType.text: 'text', MessageType.unsupported: 'unsupported', }; diff --git a/lib/src/messages/unsupported_message.g.dart b/lib/src/messages/unsupported_message.g.dart index 430730b..e04c529 100644 --- a/lib/src/messages/unsupported_message.g.dart +++ b/lib/src/messages/unsupported_message.g.dart @@ -42,7 +42,7 @@ Map _$UnsupportedMessageToJson(UnsupportedMessage instance) { writeNotNull('roomId', instance.roomId); writeNotNull('showStatus', instance.showStatus); writeNotNull('status', _$StatusEnumMap[instance.status]); - val['type'] = _$MessageTypeEnumMap[instance.type]; + val['type'] = _$MessageTypeEnumMap[instance.type]!; writeNotNull('updatedAt', instance.updatedAt); return val; } @@ -59,7 +59,7 @@ const _$MessageTypeEnumMap = { MessageType.custom: 'custom', MessageType.file: 'file', MessageType.image: 'image', - MessageType.text: 'text', MessageType.system: 'system', + MessageType.text: 'text', MessageType.unsupported: 'unsupported', }; diff --git a/pubspec.yaml b/pubspec.yaml index 1655af1..df80d24 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_chat_types description: > Utility library for the flutter_chat_ui and flutter_firebase_chat_core libraries which contains shared type declarations. -version: 3.4.3 +version: 3.4.4 homepage: https://flyer.chat repository: https://github.com/flyerhq/flutter_chat_types @@ -11,11 +11,11 @@ environment: dependencies: equatable: ^2.0.3 - json_annotation: ^4.5.0 + json_annotation: ^4.6.0 meta: ^1.7.0 dev_dependencies: - build_runner: ^2.1.11 - dart_code_metrics: ^4.15.2 + build_runner: ^2.2.0 + dart_code_metrics: ^4.17.0 flutter_lints: ^2.0.1 - json_serializable: ^6.2.0 + json_serializable: ^6.3.1