Merge pull request #272 from GetStream/fix-attachment-upload-state

Add `preparing` state to attachment upload state
GetStream · Feb 19, 2021 · 953a82c · 953a82c
2 parents 6da15f7 + ae3daee
commit 953a82c
Show file tree

Hide file tree

Showing 15 changed files with 244 additions and 20 deletions.
diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.0-beta
+
+- 🛑 **BREAKING** Changed signature of `StreamClient.search` method
+- Added `pinMessage` feature [docs here](https://getstream.io/chat/docs/flutter-dart/pinned_messages/?language=dart)
+- Fixed minor bugs
+
 ## 1.1.0-beta
 
 - Fixed minor bugs

diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
@@ -308,12 +308,7 @@ class Channel {
       attachments: message.attachments?.map(
         (it) {
           if (it.uploadState.isSuccess) return it;
-          return it.copyWith(
-            uploadState: UploadState.inProgress(
-              uploaded: 0,
-              total: it.file?.size ?? it.extraData['file_size'],
-            ),
-          );
+          return it.copyWith(uploadState: UploadState.preparing());
         },
       )?.toList(),
     );
@@ -370,12 +365,7 @@ class Channel {
       attachments: message.attachments?.map(
         (it) {
           if (it.uploadState.isSuccess) return it;
-          return it.copyWith(
-            uploadState: UploadState.inProgress(
-              uploaded: 0,
-              total: it.file?.size ?? it.extraData['file_size'],
-            ),
-          );
+          return it.copyWith(uploadState: UploadState.preparing());
         },
       )?.toList(),
     );

diff --git a/packages/stream_chat/lib/src/models/attachment_file.dart b/packages/stream_chat/lib/src/models/attachment_file.dart
@@ -10,6 +10,9 @@ part 'attachment_file.g.dart';
 /// Union class to hold various [UploadState] of a attachment.
 @freezed
 abstract class UploadState with _$UploadState {
+  /// Preparing state of the union
+  const factory UploadState.preparing() = Preparing;
+
   /// InProgress state of the union
   const factory UploadState.inProgress({int uploaded, int total}) = InProgress;
 
@@ -26,6 +29,9 @@ abstract class UploadState with _$UploadState {
 
 /// Helper extension for UploadState
 extension UploadStateX on UploadState {
+  /// Returns true if state is [Preparing]
+  bool get isPreparing => this is Preparing;
+
   /// Returns true if state is [InProgress]
   bool get isInProgress => this is InProgress;
 

diff --git a/packages/stream_chat/lib/src/models/attachment_file.freezed.dart b/packages/stream_chat/lib/src/models/attachment_file.freezed.dart
diff --git a/packages/stream_chat/lib/src/models/attachment_file.g.dart b/packages/stream_chat/lib/src/models/attachment_file.g.dart
diff --git a/packages/stream_chat/lib/version.dart b/packages/stream_chat/lib/version.dart
@@ -2,4 +2,4 @@ import 'package:stream_chat/src/client.dart';
 
 /// Current package version
 /// Used in [StreamChatClient] to build the `x-stream-client` header
-const PACKAGE_VERSION = '1.1.0-beta';
+const PACKAGE_VERSION = '1.2.0-beta';
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat
 homepage: https://getstream.io/
 description: The official Dart client for Stream Chat, a service for building chat applications.
-version: 1.1.0-beta
+version: 1.2.0-beta
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.2.0-beta
+
+- Minor fixes
+- Update stream_chat_core dependency
+
 ## 1.1.1-beta
 
 - Added MessageInput button color customization options