talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/offline

Browse Source
This commit is contained in:
Salvatore Giordano
2020-03-15 13:58:10 +01:00
parent 2f6143234a ecaed59a7d
commit 41a302145d
7 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -1,3 +1,7 @@
## 0.1.11
- Fix bug in ChannelPreview when list of messages is empty
## 0.1.10
- Do not automatically dispose Client object when disposing StreamChat widget
README.md
+1 -1
View File
@@ -30,7 +30,7 @@ The example is available under the [example](https://github.com/GetStream/stream
```yaml
dependencies:
stream_chat_flutter: ^0.1.10
stream_chat_flutter: ^0.1.11
```
You should then run `flutter packages get`
lib/src/channel_preview.dart
+3
View File
@@ -68,6 +68,9 @@ class ChannelPreview extends StatelessWidget {
stream: channel.lastMessageAtStream,
initialData: channel.lastMessageAt,
builder: (context, snapshot) {
if (!snapshot.hasData) {
return SizedBox();
}
final lastMessageAt = snapshot.data.toLocal();
String stringDate;
lib/src/message_input.dart
+15 -15
View File
@@ -449,7 +449,7 @@ class _MessageInputState extends State<MessageInput> {
Widget _buildAttachment(_SendingAttachment attachment) {
switch (attachment.type) {
case FileType.IMAGE:
case FileType.image:
return attachment.file != null
? Image.file(
attachment.file,
@@ -460,7 +460,7 @@ class _MessageInputState extends State<MessageInput> {
fit: BoxFit.cover,
);
break;
case FileType.VIDEO:
case FileType.video:
return Container(
child: Icon(Icons.videocam),
color: Colors.black26,
@@ -519,7 +519,7 @@ class _MessageInputState extends State<MessageInput> {
leading: Icon(Icons.image),
title: Text('Upload a photo'),
onTap: () {
_pickFile(FileType.IMAGE, false);
_pickFile(FileType.image, false);
Navigator.pop(context);
},
),
@@ -527,7 +527,7 @@ class _MessageInputState extends State<MessageInput> {
leading: Icon(Icons.video_library),
title: Text('Upload a video'),
onTap: () {
_pickFile(FileType.VIDEO, false);
_pickFile(FileType.video, false);
Navigator.pop(context);
},
),
@@ -536,7 +536,7 @@ class _MessageInputState extends State<MessageInput> {
title: Text('Photo from camera'),
onTap: () {
ImagePicker.pickImage(source: ImageSource.camera);
_pickFile(FileType.IMAGE, true);
_pickFile(FileType.image, true);
Navigator.pop(context);
},
),
@@ -544,7 +544,7 @@ class _MessageInputState extends State<MessageInput> {
leading: Icon(Icons.videocam),
title: Text('Video from camera'),
onTap: () {
_pickFile(FileType.VIDEO, true);
_pickFile(FileType.video, true);
Navigator.pop(context);
},
),
@@ -552,7 +552,7 @@ class _MessageInputState extends State<MessageInput> {
leading: Icon(Icons.insert_drive_file),
title: Text('Upload a file'),
onTap: () {
_pickFile(FileType.ANY, false);
_pickFile(FileType.any, false);
Navigator.pop(context);
},
),
@@ -565,9 +565,9 @@ class _MessageInputState extends State<MessageInput> {
File file;
if (camera) {
if (type == FileType.IMAGE) {
if (type == FileType.image) {
file = await ImagePicker.pickImage(source: ImageSource.camera);
} else if (type == FileType.VIDEO) {
} else if (type == FileType.video) {
file = await ImagePicker.pickVideo(source: ImageSource.camera);
}
} else {
@@ -709,17 +709,17 @@ class _MessageInputState extends State<MessageInput> {
return attachments.map((attachment) {
String type;
switch (attachment.type) {
case FileType.IMAGE:
case FileType.image:
type = 'image';
break;
case FileType.VIDEO:
case FileType.video:
type = 'video';
break;
default:
type = 'file';
}
return Attachment(
imageUrl: attachment.type == FileType.IMAGE ? attachment.url : null,
imageUrl: attachment.type == FileType.image ? attachment.url : null,
assetUrl: attachment.url,
type: type,
localUri: attachment.file.uri,
@@ -774,19 +774,19 @@ class _MessageInputState extends State<MessageInput> {
widget.editMessage.attachments.forEach((attachment) {
if (attachment.type == 'image') {
_attachments.add(_SendingAttachment(
type: FileType.IMAGE,
type: FileType.image,
url: attachment.imageUrl,
uploaded: true,
));
} else if (attachment.type == 'video') {
_attachments.add(_SendingAttachment(
type: FileType.VIDEO,
type: FileType.video,
url: attachment.assetUrl,
uploaded: true,
));
} else if (attachment.type != 'giphy') {
_attachments.add(_SendingAttachment(
type: FileType.ANY,
type: FileType.any,
url: attachment.assetUrl,
uploaded: true,
));
lib/src/message_list_view.dart
+1 -1
View File
@@ -1,8 +1,8 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_widgets/flutter_widgets.dart';
import 'package:stream_chat/stream_chat.dart';
import 'package:visibility_detector/visibility_detector.dart';
import '../stream_chat_flutter.dart';
import 'message_widget.dart';
lib/src/message_widget.dart
+1 -1
View File
@@ -96,7 +96,7 @@ class _MessageWidgetState extends State<MessageWidget>
final alignment =
_isMyMessage ? Alignment.centerRight : Alignment.centerLeft;
var row = List<Widget>.from([
var row = <Widget>[
Column(
crossAxisAlignment:
_isMyMessage ? CrossAxisAlignment.end : CrossAxisAlignment.start,
pubspec.yaml
+3 -3
View File
@@ -1,7 +1,7 @@
name: stream_chat_flutter
homepage: https://github.com/GetStream/stream-chat-flutter
description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
version: 0.1.10
version: 0.1.11
environment:
sdk: ">=2.3.0 <3.0.0"
@@ -11,18 +11,18 @@ dependencies:
sdk: flutter
photo_view: ^0.9.2
rxdart: ^0.23.1
flutter_widgets: ^0.1.11
jiffy: ^3.0.1
cached_network_image: ^2.0.0
flutter_markdown: ^0.3.4
url_launcher: ^5.4.2
video_player: ^0.10.8+1
chewie: ^0.9.10
file_picker: ^1.4.3+2
file_picker: ^1.5.0
image_picker: ^0.6.3+4
keyboard_visibility: ^0.5.6
stream_chat:
path: ../stream_chat_dart
visibility_detector: ^0.1.4
dev_dependencies:
pedantic: ^1.9.0