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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Salvatore Giordano
2021-03-02 11:52:42 +01:00
parent 41f5049076 3332a48a0e
commit 2709bded70
21 changed files with 187 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/CHANGELOG.md
+5
View File
@@ -1,3 +1,8 @@
## 1.3.2-beta
- Updated `stream_chat_core` dependency
- Fixed minor bugs
## 1.3.1-beta
- Updated `stream_chat_core` dependency
packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
+34 -30
View File
@@ -202,24 +202,26 @@ class GiphyAttachment extends AttachmentWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: FlatButton(
child: Container(
height: 50,
onPressed: () {
streamChannel.channel.sendAction(message, {
'image_action': 'cancel',
});
},
child: Text(
'Cancel',
style: StreamChatTheme.of(context)
.textTheme
.bodyBold
.copyWith(
color: StreamChatTheme.of(context)
.colorTheme
.black
.withOpacity(0.5),
),
child: TextButton(
onPressed: () {
streamChannel.channel.sendAction(message, {
'image_action': 'cancel',
});
},
child: Text(
'Cancel',
style: StreamChatTheme.of(context)
.textTheme
.bodyBold
.copyWith(
color: StreamChatTheme.of(context)
.colorTheme
.black
.withOpacity(0.5),
),
),
),
),
),
@@ -232,20 +234,22 @@ class GiphyAttachment extends AttachmentWidget {
height: 50.0,
),
Expanded(
child: FlatButton(
child: Container(
height: 50,
onPressed: () {
streamChannel.channel.sendAction(message, {
'image_action': 'send',
});
},
child: Text(
'Send',
style: TextStyle(
color: StreamChatTheme.of(context)
.colorTheme
.accentBlue,
fontWeight: FontWeight.bold),
child: TextButton(
onPressed: () {
streamChannel.channel.sendAction(message, {
'image_action': 'send',
});
},
child: Text(
'Send',
style: TextStyle(
color: StreamChatTheme.of(context)
.colorTheme
.accentBlue,
fontWeight: FontWeight.bold),
),
),
),
),
packages/stream_chat_flutter/lib/src/channel_list_view.dart
+2 -2
View File
@@ -284,7 +284,7 @@ class _ChannelListViewState extends State<ChannelListView> {
left: 0,
bottom: 32,
child: Center(
child: FlatButton(
child: TextButton(
onPressed: widget.onStartChatPressed,
child: Text(
'Start a chat',
@@ -445,7 +445,7 @@ class _ChannelListViewState extends State<ChannelListView> {
),
style: Theme.of(context).textTheme.headline6,
),
FlatButton(
TextButton(
onPressed: () => _channelListController.loadData(),
child: Text('Retry'),
),
packages/stream_chat_flutter/lib/src/channel_name.dart
+3 -1
View File
@@ -42,7 +42,9 @@ class ChannelName extends StatelessWidget {
if (extraData['name'] == null) {
final otherMembers =
members.where((member) => member.userId != client.user.id);
if (otherMembers.isNotEmpty) {
if (otherMembers.length == 1) {
title = otherMembers.first.user.name;
} else if (otherMembers.isNotEmpty) {
final maxWidth = constraints.maxWidth;
final maxChars = maxWidth / textStyle.fontSize;
var currentChars = 0;
packages/stream_chat_flutter/lib/src/message_actions_modal.dart
+2 -2
View File
@@ -348,7 +348,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FlatButton(
TextButton(
child: Text(
'OK',
style: StreamChatTheme.of(context)
@@ -413,7 +413,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FlatButton(
TextButton(
child: Text(
'OK',
style: StreamChatTheme.of(context)
packages/stream_chat_flutter/lib/src/message_input.dart
+1 -1
View File
@@ -2139,7 +2139,7 @@ class MessageInputState extends State<MessageInput> {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FlatButton(
TextButton(
child: Text(
'OK',
style: StreamChatTheme.of(context)
packages/stream_chat_flutter/lib/src/message_search_list_view.dart
+1 -1
View File
@@ -195,7 +195,7 @@ class _MessageSearchListViewState extends State<MessageSearchListView> {
padding: const EdgeInsets.only(top: 16.0),
child: Text(message),
),
RaisedButton(
ElevatedButton(
onPressed: () {
_messageSearchListController.loadData();
},
packages/stream_chat_flutter/lib/src/user_list_view.dart
+1 -1
View File
@@ -242,7 +242,7 @@ class _UserListViewState extends State<UserListView>
),
child: Text(message),
),
FlatButton(
TextButton(
onPressed: () {
_userListController.loadData();
},
packages/stream_chat_flutter/lib/src/utils.dart
+3 -3
View File
@@ -59,7 +59,7 @@ Future<bool> showConfirmationDialog(
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
FlatButton(
TextButton(
child: Text(
cancelText,
style: StreamChatTheme.of(context)
@@ -75,7 +75,7 @@ Future<bool> showConfirmationDialog(
Navigator.of(context).pop(false);
},
),
FlatButton(
TextButton(
child: Text(
okText,
style: StreamChatTheme.of(context)
@@ -145,7 +145,7 @@ Future<bool> showInfoDialog(
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
FlatButton(
TextButton(
child: Text(
okText,
style: TextStyle(
packages/stream_chat_flutter/pubspec.yaml
+2 -2
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: 1.3.1-beta
version: 1.3.2-beta
repository: https://github.com/GetStream/stream-chat-flutter
issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
@@ -11,7 +11,7 @@ environment:
dependencies:
flutter:
sdk: flutter
stream_chat_flutter_core: ^1.3.0-beta
stream_chat_flutter_core: ^1.3.2-beta
flutter_app_badger: ^1.1.2
photo_view: ^0.10.3
rxdart: ^0.25.0