From 34375127729e5889c035e6a799ab64bf4aab4e68 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Oct 2020 14:11:04 +0530 Subject: [PATCH 01/21] fix: qa fixes --- lib/src/message_input.dart | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 30910924..fffe90b5 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -354,7 +354,7 @@ class MessageInputState extends State { autofocus: false, textAlignVertical: TextAlignVertical.center, decoration: InputDecoration( - hintText: 'Write a message', + hintText: (_commandEnabled && _chosenCommand.name == 'giphy') ? 'Search GIFs' :'Write a message', prefixText: _commandEnabled ? null : ' ', border: OutlineInputBorder( borderSide: BorderSide(color: Colors.transparent)), @@ -461,6 +461,9 @@ class MessageInputState extends State { padding: const EdgeInsets.all(8.0), child: Card( elevation: 2.0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.0), + ), color: StreamChatTheme.of(context).primaryColor, clipBehavior: Clip.antiAlias, child: Container( @@ -519,7 +522,7 @@ class MessageInputState extends State { color: Colors.white, size: 12.5, ), - maxRadius: 15, + maxRadius: 12, ), //subtitle: Text(c.description), onTap: () { @@ -776,7 +779,7 @@ class MessageInputState extends State { child: Padding( padding: const EdgeInsets.only( left: 4.0, right: 8.0, top: 8.0, bottom: 8.0), - child: Icon(StreamIcons.lightning), + child: Icon(StreamIcons.lightning, color: Color(0xFF000000).withAlpha(128),), ), onTap: () { if (_commandsOverlay == null) { @@ -798,7 +801,7 @@ class MessageInputState extends State { child: Padding( padding: EdgeInsets.only( left: 8.0, right: padding, top: 8.0, bottom: 8.0), - child: Icon(StreamIcons.attach), + child: Icon(StreamIcons.attach, color: Color(0xFF000000).withAlpha(128),), ), onTap: () { showAttachmentModal(); From e16ad47e59e90fe3868d5a33a7d5a42e378569f9 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Oct 2020 14:29:20 +0530 Subject: [PATCH 02/21] fix: qa fixes --- lib/src/message_input.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index fffe90b5..81649764 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -573,6 +573,9 @@ class MessageInputState extends State { margin: EdgeInsets.all(8.0), elevation: 2.0, color: StreamChatTheme.of(context).primaryColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.0), + ), clipBehavior: Clip.antiAlias, child: Container( constraints: BoxConstraints.loose(Size.fromHeight(400)), @@ -602,7 +605,7 @@ class MessageInputState extends State { '${m.user.name}', style: TextStyle(fontWeight: FontWeight.bold), ), - subtitle: Text('${m.userId}'), + subtitle: Text('@${m.userId}'), trailing: Icon( Icons.alternate_email, color: StreamChatTheme.of(context).accentColor, From e2164c3cef380a210376cf2eee3b840709ca2e20 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Oct 2020 15:33:23 +0530 Subject: [PATCH 03/21] fix: qa fixes --- lib/src/message_input.dart | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 81649764..e3ab5574 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -607,7 +607,7 @@ class MessageInputState extends State { ), subtitle: Text('@${m.userId}'), trailing: Icon( - Icons.alternate_email, + StreamIcons.at_mention, color: StreamChatTheme.of(context).accentColor, ), onTap: () { @@ -1037,7 +1037,7 @@ class MessageInputState extends State { sendMessage(); }, child: Icon( - StreamIcons.send_message, + _getIdleSendIcon(), color: Colors.grey, ), )), @@ -1059,7 +1059,7 @@ class MessageInputState extends State { child: Transform.rotate( angle: widget.editMessage == null ? -pi / 2 : 0, child: Icon( - widget.editMessage == null ? StreamIcons.send_message : StreamIcons.check_send, + _getSendIcon(), color: StreamChatTheme.of(context).accentColor, ), ), @@ -1069,6 +1069,24 @@ class MessageInputState extends State { ); } + IconData _getIdleSendIcon() { + if (_commandEnabled) { + return StreamIcons.search; + } else { + return StreamIcons.send_message; + } + } + + IconData _getSendIcon() { + if(widget.editMessage != null) { + return StreamIcons.check_send; + } else if (_commandEnabled) { + return StreamIcons.search; + } else { + return StreamIcons.send_message; + } + } + /// Sends the current message void sendMessage() async { var text = textEditingController.text.trim(); From 8b635b440e93e91b21528bb1eb56ab6c0b7b040d Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Oct 2020 15:52:13 +0530 Subject: [PATCH 04/21] fix: qa fixes --- lib/src/message_input.dart | 62 +++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index e3ab5574..b3744152 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -192,7 +192,7 @@ class MessageInputState extends State { padding: const EdgeInsets.all(8.0), child: _buildTextField(context), ), - if(widget.parentMessage != null) + if (widget.parentMessage != null) Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0), child: _buildDmCheckbox(), @@ -222,7 +222,11 @@ class MessageInputState extends State { Widget _buildDmCheckbox() { return Row( children: [ - Checkbox(value: _sendAsDm, onChanged: (val) => setState(() {_sendAsDm = val;})), + Checkbox( + value: _sendAsDm, + onChanged: (val) => setState(() { + _sendAsDm = val; + })), Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0), child: Text('Send also as direct message'), @@ -316,9 +320,11 @@ class MessageInputState extends State { var matchedCommandsList = StreamChannel.of(context) .channel .config - .commands.where((element) => element.name == s.substring(1)).toList(); + .commands + .where((element) => element.name == s.substring(1)) + .toList(); - if(matchedCommandsList.length == 1) { + if (matchedCommandsList.length == 1) { _chosenCommand = matchedCommandsList[0]; textEditingController.clear(); _messageIsPresent = false; @@ -354,7 +360,10 @@ class MessageInputState extends State { autofocus: false, textAlignVertical: TextAlignVertical.center, decoration: InputDecoration( - hintText: (_commandEnabled && _chosenCommand.name == 'giphy') ? 'Search GIFs' :'Write a message', + hintText: + (_commandEnabled && _chosenCommand.name == 'giphy') + ? 'Search GIFs' + : 'Write a message', prefixText: _commandEnabled ? null : ' ', border: OutlineInputBorder( borderSide: BorderSide(color: Colors.transparent)), @@ -782,7 +791,10 @@ class MessageInputState extends State { child: Padding( padding: const EdgeInsets.only( left: 4.0, right: 8.0, top: 8.0, bottom: 8.0), - child: Icon(StreamIcons.lightning, color: Color(0xFF000000).withAlpha(128),), + child: Icon( + StreamIcons.lightning, + color: Color(0xFF000000).withAlpha(128), + ), ), onTap: () { if (_commandsOverlay == null) { @@ -802,9 +814,12 @@ class MessageInputState extends State { return Center( child: InkWell( child: Padding( - padding: EdgeInsets.only( - left: 8.0, right: padding, top: 8.0, bottom: 8.0), - child: Icon(StreamIcons.attach, color: Color(0xFF000000).withAlpha(128),), + padding: + EdgeInsets.only(left: 8.0, right: padding, top: 8.0, bottom: 8.0), + child: Icon( + StreamIcons.attach, + color: Color(0xFF000000).withAlpha(128), + ), ), onTap: () { showAttachmentModal(); @@ -1056,13 +1071,7 @@ class MessageInputState extends State { onTap: () { sendMessage(); }, - child: Transform.rotate( - angle: widget.editMessage == null ? -pi / 2 : 0, - child: Icon( - _getSendIcon(), - color: StreamChatTheme.of(context).accentColor, - ), - ), + child: _getSendIcon(), ), ), ), @@ -1077,13 +1086,24 @@ class MessageInputState extends State { } } - IconData _getSendIcon() { - if(widget.editMessage != null) { - return StreamIcons.check_send; + Widget _getSendIcon() { + if (widget.editMessage != null) { + return Icon( + StreamIcons.check_send, + color: StreamChatTheme.of(context).accentColor, + ); } else if (_commandEnabled) { - return StreamIcons.search; + return Icon( + StreamIcons.search, + color: StreamChatTheme.of(context).accentColor, + ); } else { - return StreamIcons.send_message; + return Transform.rotate( + angle: -pi / 2, + child: Icon( + StreamIcons.send_message, + color: StreamChatTheme.of(context).accentColor, + )); } } From 5087aecff450e949464126f7d45ec9b91449550c Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Wed, 28 Oct 2020 16:01:18 +0530 Subject: [PATCH 05/21] fix: qa fixes --- lib/src/message_input.dart | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index b3744152..9e4998d8 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -223,10 +223,14 @@ class MessageInputState extends State { return Row( children: [ Checkbox( - value: _sendAsDm, - onChanged: (val) => setState(() { - _sendAsDm = val; - })), + value: _sendAsDm, + onChanged: (val) => setState( + () { + _sendAsDm = val; + }, + ), + activeColor: Color(0xFF006CFF), + ), Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0), child: Text('Send also as direct message'), From 65c5fc9d4f4c30646a755e3b663b54d277d0ee51 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Wed, 28 Oct 2020 17:47:44 +0100 Subject: [PATCH 06/21] adapt file picker to web --- lib/src/message_input.dart | 43 ++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 5334b82b..577ba172 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:http_parser/http_parser.dart'; @@ -16,7 +16,7 @@ import 'package:stream_chat_flutter/src/user_avatar.dart'; import '../stream_chat_flutter.dart'; import 'stream_channel.dart'; -typedef FileUploader = Future Function(File, Channel); +typedef FileUploader = Future Function(PlatformFile, Channel); typedef AttachmentThumbnailBuilder = Widget Function( BuildContext, _SendingAttachment, @@ -578,8 +578,8 @@ class MessageInputState extends State { case 'image': case 'giphy': return attachment.file != null - ? Image.file( - attachment.file, + ? Image.memory( + attachment.file.bytes, fit: BoxFit.cover, ) : Image.network( @@ -711,7 +711,7 @@ class MessageInputState extends State { _inputEnabled = false; }); - File file; + PlatformFile file; String attachmentType; if (fileType == DefaultAttachmentTypes.image) { @@ -729,7 +729,11 @@ class MessageInputState extends State { } else if (fileType == DefaultAttachmentTypes.video) { pickedFile = await _imagePicker.getVideo(source: ImageSource.camera); } - file = File(pickedFile.path); + final bytes = await pickedFile.readAsBytes(); + file = PlatformFile( + path: pickedFile.path, + bytes: bytes, + ); } else { FileType type; if (fileType == DefaultAttachmentTypes.image) { @@ -739,9 +743,13 @@ class MessageInputState extends State { } else if (fileType == DefaultAttachmentTypes.file) { type = FileType.any; } - final res = await FilePicker.platform.pickFiles(type: type); + final res = await FilePicker.platform.pickFiles( + type: type, + withData: true, + ); if (res?.files?.isNotEmpty == true) { - file = File(res.files.first.path); + file = res.files.single; + print('file.bytes?.length: ${file.bytes?.length}'); } } @@ -754,11 +762,10 @@ class MessageInputState extends State { } final channel = StreamChannel.of(context).channel; - final attachment = _SendingAttachment( file: file, attachment: Attachment( - localUri: file.uri, + localUri: file.path != null ? Uri.parse(file.path) : null, type: attachmentType, ), ); @@ -785,7 +792,7 @@ class MessageInputState extends State { } Future _uploadAttachment( - File file, + PlatformFile file, DefaultAttachmentTypes type, Channel channel, ) async { @@ -806,9 +813,9 @@ class MessageInputState extends State { return url; } - Future _uploadImage(File file, Channel channel) async { - final filename = file.path.split('/').last; - final bytes = await file.readAsBytes(); + Future _uploadImage(PlatformFile file, Channel channel) async { + final filename = file.name; + final bytes = file.bytes; final res = await channel.sendImage( MultipartFile.fromBytes( bytes, @@ -819,9 +826,9 @@ class MessageInputState extends State { return res.file; } - Future _uploadFile(File file, Channel channel) async { - final filename = file.path.split('/').last; - final bytes = await file.readAsBytes(); + Future _uploadFile(PlatformFile file, Channel channel) async { + final filename = file.name; + final bytes = file.bytes; final res = await channel.sendFile( MultipartFile.fromBytes( bytes, @@ -1006,7 +1013,7 @@ class MessageInputState extends State { } class _SendingAttachment { - File file; + PlatformFile file; Attachment attachment; bool uploaded; From dcff11e18831849b9cf15b95de432ca4fc450df9 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 09:49:22 +0100 Subject: [PATCH 07/21] fix mime type --- lib/src/message_input.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 577ba172..36613f3a 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -814,7 +814,7 @@ class MessageInputState extends State { } Future _uploadImage(PlatformFile file, Channel channel) async { - final filename = file.name; + final filename = file.name ?? file.path?.split('/')?.last; final bytes = file.bytes; final res = await channel.sendImage( MultipartFile.fromBytes( @@ -827,7 +827,7 @@ class MessageInputState extends State { } Future _uploadFile(PlatformFile file, Channel channel) async { - final filename = file.name; + final filename = file.name ?? file.path?.split('/')?.last; final bytes = file.bytes; final res = await channel.sendFile( MultipartFile.fromBytes( From 145351846dbb66474c89827e896841bdb2bbb4d1 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 10:02:22 +0100 Subject: [PATCH 08/21] remove useless native code --- lib/src/message_input.dart | 86 ++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 36613f3a..13f8291c 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -664,22 +664,24 @@ class MessageInputState extends State { Navigator.pop(context); }, ), - ListTile( - leading: Icon(Icons.camera_alt), - title: Text('Photo from camera'), - onTap: () { - pickFile(DefaultAttachmentTypes.image, true); - Navigator.pop(context); - }, - ), - ListTile( - leading: Icon(Icons.videocam), - title: Text('Video from camera'), - onTap: () { - pickFile(DefaultAttachmentTypes.video, true); - Navigator.pop(context); - }, - ), + if (!kIsWeb) + ListTile( + leading: Icon(Icons.camera_alt), + title: Text('Photo from camera'), + onTap: () { + pickFile(DefaultAttachmentTypes.image, true); + Navigator.pop(context); + }, + ), + if (!kIsWeb) + ListTile( + leading: Icon(Icons.videocam), + title: Text('Video from camera'), + onTap: () { + pickFile(DefaultAttachmentTypes.video, true); + Navigator.pop(context); + }, + ), ListTile( leading: Icon(Icons.insert_drive_file), title: Text('Upload a file'), @@ -943,34 +945,36 @@ class MessageInputState extends State { void initState() { super.initState(); - _keyboardListener = KeyboardVisibility.onChange.listen((visible) { - if (visible) { - if (_commandsOverlay != null) { - if (textEditingController.text.startsWith('/')) { - WidgetsBinding.instance.addPostFrameCallback((_) { - _commandsOverlay = _buildCommandsOverlayEntry(); - Overlay.of(context).insert(_commandsOverlay); - }); + if (!kIsWeb) { + _keyboardListener = KeyboardVisibility.onChange.listen((visible) { + if (visible) { + if (_commandsOverlay != null) { + if (textEditingController.text.startsWith('/')) { + WidgetsBinding.instance.addPostFrameCallback((_) { + _commandsOverlay = _buildCommandsOverlayEntry(); + Overlay.of(context).insert(_commandsOverlay); + }); + } } - } - if (_mentionsOverlay != null) { - if (textEditingController.text.contains('@')) { - WidgetsBinding.instance.addPostFrameCallback((_) { - _mentionsOverlay = _buildCommandsOverlayEntry(); - Overlay.of(context).insert(_mentionsOverlay); - }); + if (_mentionsOverlay != null) { + if (textEditingController.text.contains('@')) { + WidgetsBinding.instance.addPostFrameCallback((_) { + _mentionsOverlay = _buildCommandsOverlayEntry(); + Overlay.of(context).insert(_mentionsOverlay); + }); + } + } + } else { + if (_commandsOverlay != null) { + _commandsOverlay.remove(); + } + if (_mentionsOverlay != null) { + _mentionsOverlay.remove(); } } - } else { - if (_commandsOverlay != null) { - _commandsOverlay.remove(); - } - if (_mentionsOverlay != null) { - _mentionsOverlay.remove(); - } - } - }); + }); + } textEditingController = widget.textEditingController ?? TextEditingController(); @@ -997,7 +1001,7 @@ class MessageInputState extends State { void dispose() { _commandsOverlay?.remove(); _mentionsOverlay?.remove(); - _keyboardListener.cancel(); + _keyboardListener?.cancel(); super.dispose(); } From 3a575dcbd80ee335848db5a54ffa85c818d6376f Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 10:27:43 +0100 Subject: [PATCH 09/21] trigger action on prs on every branch --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4cd593cf..373aa879 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,8 +5,6 @@ on: branches: - master pull_request: - branches: - - master release: types: - created From f858cbf46044e2ec478485e7960fd0844d966abc Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Thu, 29 Oct 2020 15:12:46 +0530 Subject: [PATCH 10/21] fix: qa fixes --- images/giphy_icon.png | Bin 0 -> 400 bytes lib/src/message_input.dart | 6 ++++++ pubspec.yaml | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 images/giphy_icon.png diff --git a/images/giphy_icon.png b/images/giphy_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ea99e8341848dcbb49d654ff1847818bb301cf92 GIT binary patch literal 400 zcmV;B0dM|^P)xRK7oUqgCh17d;%Xq#3#_r!AWp;a1b4&P(?>Wp+hP3 z51~VHPf!1(ZFq-TZqD{20kU0~*(*mS~qP@%xE^K=!GnI-@@WFcR1u(CkFdy`sC*C;@Zdf(X!+WEF zj_*ekOxFp8L1^OW#Bm-=C7iLLk|2p^*Tq+}Ikeh0j`8DdLHP$s4B~#bTBx#Q;BeR7 z)eI)^TJqZkWYXC+4Pw{;gPCpQ13(%`=OGdcJ`W%@ioBj0baEi~67BmFByp=-NI!7# uGHx5*#vp6MKRCiN=+#dc|9??~b?E~xRAC+pj+ux60000 { enabled: _inputEnabled, minLines: null, maxLines: null, + expands: true, onSubmitted: (_) { sendMessage(); }, @@ -513,6 +514,11 @@ class MessageInputState extends State { ...commands .map( (c) => ListTile( + leading: c.name == 'giphy' ? CircleAvatar( + backgroundColor: Colors.black, + child: Image.asset('images/giphy_icon.png'), + maxRadius: 12.0, + ) : null, title: Text.rich( TextSpan( text: '${c.name.capitalize()}', diff --git a/pubspec.yaml b/pubspec.yaml index edd19589..a9285b4c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,6 +32,8 @@ dependencies: clipboard: ^0.1.2+8 flutter: + assets: + - images/giphy_icon.png fonts: - family: stream-icons fonts: From 76f5b0a0607e60e20cf127479a9454460445666e Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Thu, 29 Oct 2020 15:18:45 +0530 Subject: [PATCH 11/21] fix: qa fixes --- lib/src/message_input.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 0b84e823..116b66d5 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -514,7 +514,7 @@ class MessageInputState extends State { ...commands .map( (c) => ListTile( - leading: c.name == 'giphy' ? CircleAvatar( + leading: c.name == '/giphy' ? CircleAvatar( backgroundColor: Colors.black, child: Image.asset('images/giphy_icon.png'), maxRadius: 12.0, From d9d0bba99946594ebc8a48142e74dd9bf822f2a0 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Thu, 29 Oct 2020 15:20:45 +0530 Subject: [PATCH 12/21] fix: qa fixes --- lib/src/message_input.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 116b66d5..0b84e823 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -514,7 +514,7 @@ class MessageInputState extends State { ...commands .map( (c) => ListTile( - leading: c.name == '/giphy' ? CircleAvatar( + leading: c.name == 'giphy' ? CircleAvatar( backgroundColor: Colors.black, child: Image.asset('images/giphy_icon.png'), maxRadius: 12.0, From dbb4b37161c96bf60a26ab39c17fe9f0ffedd242 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Thu, 29 Oct 2020 15:40:30 +0530 Subject: [PATCH 13/21] fix: textfield height issues solved --- lib/src/message_input.dart | 45 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 0b84e823..56a3989a 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -282,26 +282,25 @@ class MessageInputState extends State { Expanded _buildTextInput(BuildContext context) { return Expanded( child: Center( - child: LimitedBox( - maxHeight: widget.maxHeight, - child: Container( - clipBehavior: Clip.antiAlias, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(32.0), - border: Border.all( - color: Colors.grey, - ), + child: Container( + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(32.0), + border: Border.all( + color: Colors.grey, ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - _buildAttachments(), - TextField( + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + _buildAttachments(), + LimitedBox( + maxHeight: widget.maxHeight, + child: TextField( key: Key('messageInputText'), enabled: _inputEnabled, minLines: null, maxLines: null, - expands: true, onSubmitted: (_) { sendMessage(); }, @@ -412,8 +411,8 @@ class MessageInputState extends State { ), textCapitalization: TextCapitalization.sentences, ), - ], - ), + ) + ], ), ), ), @@ -514,11 +513,13 @@ class MessageInputState extends State { ...commands .map( (c) => ListTile( - leading: c.name == 'giphy' ? CircleAvatar( - backgroundColor: Colors.black, - child: Image.asset('images/giphy_icon.png'), - maxRadius: 12.0, - ) : null, + leading: c.name == 'giphy' + ? CircleAvatar( + backgroundColor: Colors.black, + child: Image.asset('images/giphy_icon.png'), + maxRadius: 12.0, + ) + : null, title: Text.rich( TextSpan( text: '${c.name.capitalize()}', From ccd70a2a7aa40636004de5f1b1d8654f155e8160 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Thu, 29 Oct 2020 15:54:13 +0530 Subject: [PATCH 14/21] fix: giphy fixes --- lib/src/message_input.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 56a3989a..631bf9ef 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -516,7 +516,12 @@ class MessageInputState extends State { leading: c.name == 'giphy' ? CircleAvatar( backgroundColor: Colors.black, - child: Image.asset('images/giphy_icon.png'), + child: Image.asset( + 'images/giphy_icon.png', + package: 'stream_chat_flutter', + width: 16.0, + height: 16.0, + ), maxRadius: 12.0, ) : null, From 8384b605323232616104d66ac28661a970acb6f6 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 13:27:11 +0100 Subject: [PATCH 15/21] use stream chat theme --- lib/src/message_input.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 631bf9ef..5745f779 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -229,7 +229,7 @@ class MessageInputState extends State { _sendAsDm = val; }, ), - activeColor: Color(0xFF006CFF), + activeColor: StreamChatTheme.of(context).accentColor, ), Padding( padding: const EdgeInsets.symmetric(horizontal: 8.0), From 9f8248738d36fcd2bacac85ab1805eeed568b2ab Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Thu, 29 Oct 2020 19:31:48 +0530 Subject: [PATCH 16/21] feat: Converted png to svg --- images/giphy_icon.png | Bin 400 -> 0 bytes images/giphy_icon.svg | 9 +++++++++ lib/src/message_input.dart | 5 +++-- pubspec.yaml | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 images/giphy_icon.png create mode 100644 images/giphy_icon.svg diff --git a/images/giphy_icon.png b/images/giphy_icon.png deleted file mode 100644 index ea99e8341848dcbb49d654ff1847818bb301cf92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmV;B0dM|^P)xRK7oUqgCh17d;%Xq#3#_r!AWp;a1b4&P(?>Wp+hP3 z51~VHPf!1(ZFq-TZqD{20kU0~*(*mS~qP@%xE^K=!GnI-@@WFcR1u(CkFdy`sC*C;@Zdf(X!+WEF zj_*ekOxFp8L1^OW#Bm-=C7iLLk|2p^*Tq+}Ikeh0j`8DdLHP$s4B~#bTBx#Q;BeR7 z)eI)^TJqZkWYXC+4Pw{;gPCpQ13(%`=OGdcJ`W%@ioBj0baEi~67BmFByp=-NI!7# uGHx5*#vp6MKRCiN=+#dc|9??~b?E~xRAC+pj+ux60000 + + + + + + + + diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 5745f779..9b0128e2 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -6,6 +6,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:http_parser/http_parser.dart'; import 'package:image_picker/image_picker.dart'; import 'package:mime/mime.dart'; @@ -516,8 +517,8 @@ class MessageInputState extends State { leading: c.name == 'giphy' ? CircleAvatar( backgroundColor: Colors.black, - child: Image.asset( - 'images/giphy_icon.png', + child: SvgPicture.asset( + 'images/giphy_icon.svg', package: 'stream_chat_flutter', width: 16.0, height: 16.0, diff --git a/pubspec.yaml b/pubspec.yaml index d61e6874..bf894a2d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,10 +32,11 @@ dependencies: carousel_slider: ^2.2.1 clipboard: ^0.1.2+8 widgets_visibility_provider: ^2.0.2 + flutter_svg: ^0.19.1 flutter: assets: - - images/giphy_icon.png + - images/giphy_icon.svg fonts: - family: stream-icons fonts: From 8c49ce2667575c9d6544945cf5ffca48f86d1be0 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Thu, 29 Oct 2020 19:48:05 +0530 Subject: [PATCH 17/21] Revert "feat: Converted png to svg" This reverts commit 9f824873 --- images/giphy_icon.png | Bin 0 -> 400 bytes images/giphy_icon.svg | 9 --------- lib/src/message_input.dart | 5 ++--- pubspec.yaml | 3 +-- 4 files changed, 3 insertions(+), 14 deletions(-) create mode 100644 images/giphy_icon.png delete mode 100644 images/giphy_icon.svg diff --git a/images/giphy_icon.png b/images/giphy_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ea99e8341848dcbb49d654ff1847818bb301cf92 GIT binary patch literal 400 zcmV;B0dM|^P)xRK7oUqgCh17d;%Xq#3#_r!AWp;a1b4&P(?>Wp+hP3 z51~VHPf!1(ZFq-TZqD{20kU0~*(*mS~qP@%xE^K=!GnI-@@WFcR1u(CkFdy`sC*C;@Zdf(X!+WEF zj_*ekOxFp8L1^OW#Bm-=C7iLLk|2p^*Tq+}Ikeh0j`8DdLHP$s4B~#bTBx#Q;BeR7 z)eI)^TJqZkWYXC+4Pw{;gPCpQ13(%`=OGdcJ`W%@ioBj0baEi~67BmFByp=-NI!7# uGHx5*#vp6MKRCiN=+#dc|9??~b?E~xRAC+pj+ux60000 - - - - - - - - diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart index 9b0128e2..5745f779 100644 --- a/lib/src/message_input.dart +++ b/lib/src/message_input.dart @@ -6,7 +6,6 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; -import 'package:flutter_svg/flutter_svg.dart'; import 'package:http_parser/http_parser.dart'; import 'package:image_picker/image_picker.dart'; import 'package:mime/mime.dart'; @@ -517,8 +516,8 @@ class MessageInputState extends State { leading: c.name == 'giphy' ? CircleAvatar( backgroundColor: Colors.black, - child: SvgPicture.asset( - 'images/giphy_icon.svg', + child: Image.asset( + 'images/giphy_icon.png', package: 'stream_chat_flutter', width: 16.0, height: 16.0, diff --git a/pubspec.yaml b/pubspec.yaml index bf894a2d..d61e6874 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,11 +32,10 @@ dependencies: carousel_slider: ^2.2.1 clipboard: ^0.1.2+8 widgets_visibility_provider: ^2.0.2 - flutter_svg: ^0.19.1 flutter: assets: - - images/giphy_icon.svg + - images/giphy_icon.png fonts: - family: stream-icons fonts: From 4958f99151cfdda91f1e4ce8ee96e982ce84f0ce Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 16:24:49 +0100 Subject: [PATCH 18/21] fix ci? --- example/ios/Flutter/.last_build_id | 2 +- example/ios/Podfile.lock | 8 ++++---- example/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id index 661f8167..5d3809be 100644 --- a/example/ios/Flutter/.last_build_id +++ b/example/ios/Flutter/.last_build_id @@ -1 +1 @@ -89eb023669fee58472de747080d78b5a \ No newline at end of file +bdf1751976c4ee1e2ef7638eabcfd1ea \ No newline at end of file diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 1e268608..0068f96c 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -124,9 +124,9 @@ PODS: - SDWebImage/Core (5.9.3) - shared_preferences (0.0.1): - Flutter - - sqflite (0.0.1): + - sqflite (0.0.2): - Flutter - - FMDB (~> 2.7.2) + - FMDB (>= 2.7.5) - sqlite3 (3.32.3): - sqlite3/common (= 3.32.3) - sqlite3/common (3.32.3) @@ -248,7 +248,7 @@ SPEC CHECKSUMS: FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b FirebaseMessaging: 29543feb343b09546ab3aa04d008ee8595b43c44 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec - flutter_apns: f516b118e423fe7c0a38771180549c4d6cb67c2f + flutter_apns: ddc629f26016140bf52165040b0a8e8869f9ce32 flutter_app_badger: 65de4d6f0c34a891df49e6cfb8a1c0496426fa68 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 @@ -262,7 +262,7 @@ SPEC CHECKSUMS: Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748 SDWebImage: a31ee8e90a97303529e03fb0c333eae0eacb88e9 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 + sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 sqlite3: 8f7d2078ae27778699a622a94b853285793422a2 sqlite3_flutter_libs: 5651f8ff48e3b44d910863c4ea5916085b1b245f Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9 diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c73804eb..dac40d3b 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.0.36+38 +version: 1.0.37+39 environment: sdk: ">=2.2.2 <3.0.0" From 8963697a89c14347aa7ab4d278b8c7d11b83f95b Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 16:35:13 +0100 Subject: [PATCH 19/21] upagrad github action --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e814cb60..e4c6f701 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: CI +name: Build on: push: @@ -18,7 +18,7 @@ jobs: run: | cd example/ios bundle install - - uses: subosito/flutter-action@v1.3.2 + - uses: subosito/flutter-action@v1.4.0 with: channel: 'stable' - name: Install firebase-tools @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-java@v1 with: java-version: '12.x' - - uses: subosito/flutter-action@v1.3.2 + - uses: subosito/flutter-action@v1.4.0 with: channel: 'stable' - run: | From 1f4caa1039428e003dcf900cc5a673c68c17ebcd Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 16:53:05 +0100 Subject: [PATCH 20/21] fix android build --- example/android/app/build.gradle | 4 +- example/ios/Podfile.lock | 90 +++++++++++++++----------------- example/pubspec.yaml | 2 +- 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 474bfd75..33c33ff2 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 29 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.example" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 0068f96c..d20eaee6 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -33,49 +33,45 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/CoreOnly (6.26.0): - - FirebaseCore (= 6.7.2) - - Firebase/Messaging (6.26.0): + - Firebase/CoreOnly (6.33.0): + - FirebaseCore (= 6.10.3) + - Firebase/Messaging (6.33.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 4.4.1) - - firebase_core (0.5.0-1): - - Firebase/CoreOnly (~> 6.26.0) + - FirebaseMessaging (~> 4.7.0) + - firebase_core (0.5.1): + - Firebase/CoreOnly (~> 6.33.0) - Flutter - firebase_messaging (7.0.3): - - Firebase/CoreOnly (~> 6.26.0) - - Firebase/Messaging (~> 6.26.0) + - Firebase/CoreOnly (~> 6.33.0) + - Firebase/Messaging (~> 6.33.0) - firebase_core - Flutter - - FirebaseAnalyticsInterop (1.5.0) - - FirebaseCore (6.7.2): - - FirebaseCoreDiagnostics (~> 1.3) - - FirebaseCoreDiagnosticsInterop (~> 1.2) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/Logger (~> 6.5) + - FirebaseCore (6.10.3): + - FirebaseCoreDiagnostics (~> 1.6) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/Logger (~> 6.7) - FirebaseCoreDiagnostics (1.7.0): - GoogleDataTransport (~> 7.4) - GoogleUtilities/Environment (~> 6.7) - GoogleUtilities/Logger (~> 6.7) - nanopb (~> 1.30906.0) - - FirebaseCoreDiagnosticsInterop (1.2.0) - - FirebaseInstallations (1.3.0): - - FirebaseCore (~> 6.6) - - GoogleUtilities/Environment (~> 6.6) - - GoogleUtilities/UserDefaults (~> 6.6) + - FirebaseInstallations (1.7.0): + - FirebaseCore (~> 6.10) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/UserDefaults (~> 6.7) - PromisesObjC (~> 1.2) - - FirebaseInstanceID (4.3.4): - - FirebaseCore (~> 6.6) - - FirebaseInstallations (~> 1.0) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/UserDefaults (~> 6.5) - - FirebaseMessaging (4.4.1): - - FirebaseAnalyticsInterop (~> 1.5) - - FirebaseCore (~> 6.6) - - FirebaseInstanceID (~> 4.3) - - GoogleUtilities/AppDelegateSwizzler (~> 6.5) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/Reachability (~> 6.5) - - GoogleUtilities/UserDefaults (~> 6.5) + - FirebaseInstanceID (4.8.0): + - FirebaseCore (~> 6.10) + - FirebaseInstallations (~> 1.6) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/UserDefaults (~> 6.7) + - FirebaseMessaging (4.7.1): + - FirebaseCore (~> 6.10) + - FirebaseInstanceID (~> 4.7) + - GoogleUtilities/AppDelegateSwizzler (~> 6.7) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/Reachability (~> 6.7) + - GoogleUtilities/UserDefaults (~> 6.7) - Protobuf (>= 3.9.2, ~> 3.9) - Flutter (1.0.0) - flutter_apns (0.0.1): @@ -119,9 +115,9 @@ PODS: - Flutter - PromisesObjC (1.2.11) - Protobuf (3.13.0) - - SDWebImage (5.9.3): - - SDWebImage/Core (= 5.9.3) - - SDWebImage/Core (5.9.3) + - SDWebImage (5.9.4): + - SDWebImage/Core (= 5.9.4) + - SDWebImage/Core (5.9.4) - shared_preferences (0.0.1): - Flutter - sqflite (0.0.2): @@ -146,7 +142,7 @@ PODS: - sqlite3/perf-threadsafe - sqlite3/rtree - Starscream (4.0.4) - - StreamChatClient (2.4.0): + - StreamChatClient (2.4.1): - Starscream (~> 4.0) - SwiftyGif (5.3.0) - url_launcher (0.0.1): @@ -180,10 +176,8 @@ SPEC REPOS: - DKImagePickerController - DKPhotoGallery - Firebase - - FirebaseAnalyticsInterop - FirebaseCore - FirebaseCoreDiagnostics - - FirebaseCoreDiagnosticsInterop - FirebaseInstallations - FirebaseInstanceID - FirebaseMessaging @@ -237,16 +231,14 @@ SPEC CHECKSUMS: DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1 - Firebase: 7cf5f9c67f03cb3b606d1d6535286e1080e57eb6 - firebase_core: 00e54a4744164a6b5a250b96dd1ad5afaba7a342 - firebase_messaging: 666d9994651b1ecf8c582b52dd913f3fa58c17ef - FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae - FirebaseCore: f42e5e5f382cdcf6b617ed737bf6c871a6947b17 + Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5 + firebase_core: aa25a5dc6b492ecab37587c53d8420135f0cac90 + firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75 + FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1 - FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850 - FirebaseInstallations: 6f5f680e65dc374397a483c32d1799ba822a395b - FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b - FirebaseMessaging: 29543feb343b09546ab3aa04d008ee8595b43c44 + FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2 + FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1 + FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a Flutter: 0e3d915762c693b495b44d77113d4970485de6ec flutter_apns: ddc629f26016140bf52165040b0a8e8869f9ce32 flutter_app_badger: 65de4d6f0c34a891df49e6cfb8a1c0496426fa68 @@ -260,13 +252,13 @@ SPEC CHECKSUMS: path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748 - SDWebImage: a31ee8e90a97303529e03fb0c333eae0eacb88e9 + SDWebImage: b69257f4ab14e9b6a2ef53e910fdf914d8f757c1 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 sqlite3: 8f7d2078ae27778699a622a94b853285793422a2 sqlite3_flutter_libs: 5651f8ff48e3b44d910863c4ea5916085b1b245f Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9 - StreamChatClient: 8c83a141e753e45fa096ff56d4b782d59e46f251 + StreamChatClient: d061cf52babcd9df930aee9cf864ab0379427eff SwiftyGif: e466e86c660d343357ab944a819a101c4127cb40 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e diff --git a/example/pubspec.yaml b/example/pubspec.yaml index dac40d3b..69a45dc9 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.0.37+39 +version: 1.0.38+40 environment: sdk: ">=2.2.2 <3.0.0" From a1f556ca2d8dc53dc49924470f72bf7f4c7c6acb Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 29 Oct 2020 17:58:53 +0100 Subject: [PATCH 21/21] fix android build --- example/android/app/build.gradle | 1 + example/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 33c33ff2..c5ff1b9e 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -27,6 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion 29 + ndkVersion '21.3.6528147' sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 69a45dc9..842f471c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.0.38+40 +version: 1.0.39+41 environment: sdk: ">=2.2.2 <3.0.0"