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

fix qa problems

Browse Source
This commit is contained in:
Salvatore Giordano
2020-11-05 14:35:50 +01:00
parent be4805116f
commit 119c6660e9
4 changed files with 195 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/ios/Flutter/.last_build_id
+1 -1
View File
@@ -1 +1 @@
bdf1751976c4ee1e2ef7638eabcfd1ea bb5f9103d9045cd6244bcae1f5f343e5
example/pubspec.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
name: example name: example
description: A new Flutter project. description: A new Flutter project.
version: 1.0.39+41 version: 1.0.40+42
environment: environment:
sdk: ">=2.2.2 <3.0.0" sdk: ">=2.2.2 <3.0.0"
lib/src/giphy_attachment.dart
+187 -172
View File
@@ -41,196 +41,211 @@ class GiphyAttachment extends StatelessWidget {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Card( DecoratedBox(
clipBehavior: Clip.antiAlias, decoration: BoxDecoration(),
shape: RoundedRectangleBorder( child: Card(
borderRadius: BorderRadius.only( elevation: 2,
topRight: Radius.circular(16.0), clipBehavior: Clip.antiAlias,
bottomRight: Radius.circular(0.0), shape: RoundedRectangleBorder(
topLeft: Radius.circular(16.0), borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(16.0), topRight: Radius.circular(16.0),
bottomRight: Radius.circular(0.0),
topLeft: Radius.circular(16.0),
bottomLeft: Radius.circular(16.0),
),
), ),
), child: Column(
child: Column( mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch,
crossAxisAlignment: CrossAxisAlignment.stretch, children: <Widget>[
children: <Widget>[ Stack(
Stack( children: [
children: [ Padding(
Padding( padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.all(8.0), child: GestureDetector(
child: GestureDetector( onTap: () {
onTap: () { Navigator.push(context,
Navigator.push(context, MaterialPageRoute(builder: (_) { MaterialPageRoute(builder: (_) {
return FullScreenImage( return FullScreenImage(
url: attachment.imageUrl ?? url: attachment.imageUrl ??
attachment.assetUrl ?? attachment.assetUrl ??
attachment.thumbUrl, attachment.thumbUrl,
); );
})); }));
},
child: CachedNetworkImage(
height: size?.height,
width: size?.width,
placeholder: (_, __) {
return Container(
width: size?.width,
height: size?.height,
child: Center(
child: CircularProgressIndicator(),
),
);
}, },
imageUrl: attachment.thumbUrl ?? child: CachedNetworkImage(
attachment.imageUrl ?? height: size?.height,
attachment.assetUrl, width: size?.width,
errorWidget: (context, url, error) => AttachmentError( placeholder: (_, __) {
attachment: attachment, return Container(
size: size, width: size?.width,
height: size?.height,
child: Center(
child: CircularProgressIndicator(),
),
);
},
imageUrl: attachment.thumbUrl ??
attachment.imageUrl ??
attachment.assetUrl,
errorWidget: (context, url, error) => AttachmentError(
attachment: attachment,
size: size,
),
fit: BoxFit.cover,
), ),
fit: BoxFit.cover,
), ),
), ),
), Positioned(
Positioned( left: 0,
left: 0, top: 0,
top: 0, child: Container(
child: Container( decoration: BoxDecoration(
decoration: BoxDecoration( color: Colors.white,
color: Colors.white, borderRadius: BorderRadius.only(
borderRadius: BorderRadius.only( bottomRight: Radius.circular(16.0),
bottomRight: Radius.circular(16.0), )),
)), child: Padding(
child: Padding( padding: const EdgeInsets.only(
padding: const EdgeInsets.only( left: 8.0,
left: 8.0, right: 8.0,
right: 8.0, top: 8.0,
top: 8.0, bottom: 4.0,
bottom: 4.0, ),
), child: Row(
child: Row( children: [
children: [ Icon(
Icon( StreamIcons.lightning,
StreamIcons.lightning,
color: StreamChatTheme.of(context).accentColor,
size: 16.0,
),
Text(
'GIPHY',
style: TextStyle(
color: StreamChatTheme.of(context).accentColor, color: StreamChatTheme.of(context).accentColor,
fontWeight: FontWeight.bold, size: 16.0,
fontSize: 11.0, ),
Text(
'GIPHY',
style: TextStyle(
color:
StreamChatTheme.of(context).accentColor,
fontWeight: FontWeight.bold,
fontSize: 11.0,
),
),
],
),
),
),
),
],
),
if (attachment.title != null)
Container(
alignment: Alignment.bottomCenter,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Card(
elevation: 2,
child: IconButton(
padding: const EdgeInsets.all(0),
constraints: BoxConstraints.tight(Size(32, 32)),
icon: Icon(
StreamIcons.left,
size: 24.0,
),
splashRadius: 16,
onPressed: () {
streamChannel.channel.sendAction(message, {
'image_action': 'shuffle',
});
},
),
shape: CircleBorder(),
),
Expanded(
child: Center(
child: Text(
'"${attachment.title}"',
style: TextStyle(
fontStyle: FontStyle.italic,
),
), ),
), ),
],
),
),
),
),
],
),
if (attachment.title != null)
Container(
alignment: Alignment.bottomCenter,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Card(
child: IconButton(
icon: Icon(
StreamIcons.left,
size: 24.0,
), ),
splashRadius: 24, Card(
onPressed: () { elevation: 2,
streamChannel.channel.sendAction(message, { child: IconButton(
'image_action': 'shuffle', padding: const EdgeInsets.all(0),
}); constraints: BoxConstraints.tight(Size(32, 32)),
}, icon: Icon(
), StreamIcons.right,
shape: CircleBorder(), size: 24.0,
), ),
Expanded( splashRadius: 16,
child: Center( onPressed: () {
child: Text( streamChannel.channel.sendAction(message, {
'"${attachment.title}"', 'image_action': 'shuffle',
style: TextStyle( });
fontStyle: FontStyle.italic, },
), ),
shape: CircleBorder(),
), ),
), ],
), ),
Card( ),
child: IconButton(
icon: Icon(
StreamIcons.right,
size: 24.0,
),
splashRadius: 24,
onPressed: () {
streamChannel.channel.sendAction(message, {
'image_action': 'shuffle',
});
},
),
shape: CircleBorder(),
),
],
), ),
SizedBox(
height: 4.0,
), ),
SizedBox( Container(
height: 4.0, color: Colors.black.withOpacity(0.2),
), width: double.infinity,
Container( height: 0.5,
color: Colors.black.withOpacity(0.2), ),
width: double.infinity, Row(
height: 0.5, mainAxisAlignment: MainAxisAlignment.start,
), crossAxisAlignment: CrossAxisAlignment.center,
Row( children: [
mainAxisAlignment: MainAxisAlignment.start, Expanded(
crossAxisAlignment: CrossAxisAlignment.center, child: FlatButton(
children: [ height: 50,
Expanded( onPressed: () {
child: FlatButton( streamChannel.channel.sendAction(message, {
height: 50, 'image_action': 'cancel',
onPressed: () { });
streamChannel.channel.sendAction(message, { },
'image_action': 'cancel', child: Text(
}); 'Cancel',
}, style: TextStyle(
child: Text( fontWeight: FontWeight.bold,
'Cancel', color: Colors.black.withOpacity(0.5)),
style: TextStyle( ),
fontWeight: FontWeight.bold,
color: Colors.black.withOpacity(0.5)),
), ),
), ),
), Container(
Container( width: 0.5,
width: 0.5, color: Colors.black.withOpacity(0.2),
color: Colors.black.withOpacity(0.2), height: 50.0,
height: 50.0, ),
), Expanded(
Expanded( child: FlatButton(
child: FlatButton( height: 50,
height: 50, onPressed: () {
onPressed: () { streamChannel.channel.sendAction(message, {
streamChannel.channel.sendAction(message, { 'image_action': 'send',
'image_action': 'send', });
}); },
}, child: Text(
child: Text( 'Send',
'Send', style: TextStyle(
style: TextStyle( color: StreamChatTheme.of(context).accentColor,
color: StreamChatTheme.of(context).accentColor, fontWeight: FontWeight.bold),
fontWeight: FontWeight.bold), ),
), ),
), ),
), ],
], ),
), ],
], ),
), ),
), ),
SizedBox( SizedBox(
lib/src/message_input.dart
+6 -14
View File
@@ -483,13 +483,6 @@ class MessageInputState extends State<MessageInput> {
child: Container( child: Container(
constraints: BoxConstraints.loose(Size.fromHeight(400)), constraints: BoxConstraints.loose(Size.fromHeight(400)),
decoration: BoxDecoration( decoration: BoxDecoration(
// boxShadow: [
// BoxShadow(
// spreadRadius: -8,
// blurRadius: 5.0,
// offset: Offset(0, -4),
// ),
// ],
color: StreamChatTheme.of(context).primaryColor, color: StreamChatTheme.of(context).primaryColor,
borderRadius: BorderRadius.circular(8.0)), borderRadius: BorderRadius.circular(8.0)),
child: ListView( child: ListView(
@@ -606,13 +599,6 @@ class MessageInputState extends State<MessageInput> {
child: Container( child: Container(
constraints: BoxConstraints.loose(Size.fromHeight(400)), constraints: BoxConstraints.loose(Size.fromHeight(400)),
decoration: BoxDecoration( decoration: BoxDecoration(
boxShadow: [
BoxShadow(
spreadRadius: -8,
blurRadius: 5.0,
offset: Offset(0, -4),
),
],
color: StreamChatTheme.of(context).primaryColor, color: StreamChatTheme.of(context).primaryColor,
), ),
child: FutureBuilder<List<Member>>( child: FutureBuilder<List<Member>>(
@@ -625,6 +611,12 @@ class MessageInputState extends State<MessageInput> {
children: snapshot.data children: snapshot.data
.map((m) => ListTile( .map((m) => ListTile(
leading: UserAvatar( leading: UserAvatar(
constraints: BoxConstraints.tight(
Size(
40,
40,
),
),
user: m.user, user: m.user,
), ),
title: Text( title: Text(