version bump

lib/src/channel_list_view.dart

@@ -165,7 +165,7 @@ class _ChannelListViewState extends State<ChannelListView>
                           TextSpan(text: 'Error loading channels'),
                         ],
                       ),
-                      style: Theme.of(context).textTheme.title,
+                      style: Theme.of(context).textTheme.headline6,
                     ),
                     Padding(
                       padding: const EdgeInsets.only(

lib/src/date_divider.dart

@@ -67,7 +67,8 @@ class DateDivider extends StatelessWidget {
             ),
             style: TextStyle(
               fontSize: 10,
-              color: Theme.of(context).textTheme.title.color.withOpacity(.5),
+              color:
+                  Theme.of(context).textTheme.headline6.color.withOpacity(.5),
             ),
           ),
         ),

lib/src/full_screen_video.dart

@@ -21,7 +21,7 @@ class _FullScreenVideoState extends State<FullScreenVideo> {
   ChewieController _chewieController;
   VideoPlayerController _videoPlayerController;
   bool initialized = false;
-  GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey();
+  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey();
 
   @override
   Widget build(BuildContext context) {
@@ -71,8 +71,8 @@ class _FullScreenVideoState extends State<FullScreenVideo> {
 
   @override
   void dispose() {
-    _videoPlayerController.dispose();
-    _chewieController.dispose();
+    _videoPlayerController?.dispose();
+    _chewieController?.dispose();
     super.dispose();
   }
 }

lib/src/giphy_attachment.dart

@@ -6,6 +6,7 @@ import '../stream_chat_flutter.dart';
 import 'attachment_error.dart';
 import 'attachment_title.dart';
 import 'full_screen_image.dart';
+import 'utils.dart';
 
 class GiphyAttachment extends StatelessWidget {
   final Attachment attachment;
@@ -48,8 +49,7 @@ class GiphyAttachment extends StatelessWidget {
                 }));
               },
               child: Hero(
-                tag:
-                    '${message.id} - ${attachment.imageUrl ?? attachment.assetUrl ?? attachment.thumbUrl}',
+                tag: getAttachmentHeroTag(message, attachment),
                 child: CachedNetworkImage(
                   height: size?.height,
                   width: size?.width,

lib/src/image_attachment.dart

@@ -38,8 +38,7 @@ class ImageAttachment extends StatelessWidget {
             children: <Widget>[
               Expanded(
                 child: Hero(
-                  tag:
-                      '${message.id} - ${attachment.imageUrl ?? attachment.assetUrl ?? attachment.thumbUrl}',
+                  tag: getAttachmentHeroTag(message, attachment),
                   child: GestureDetector(
                     onTap: () {
                       Navigator.push(context, MaterialPageRoute(builder: (_) {

lib/src/message_input.dart

@@ -275,7 +275,7 @@ class MessageInputState extends State<MessageInput> {
               _typingStarted = true;
             });
           },
-          style: Theme.of(context).textTheme.body1,
+          style: Theme.of(context).textTheme.bodyText2,
           autofocus: false,
           decoration: InputDecoration(
             hintText: 'Write a message',

lib/src/message_widget.dart

@@ -339,9 +339,8 @@ class _MessageWidgetState extends State<MessageWidget> {
       if (_reactionPickerKey.currentContext != null &&
           widget.message.reactionCounts != null &&
           widget.message.reactionCounts.values
-                  .where((element) => element > 0)
-                  .length >
-              0) {
+              .where((element) => element > 0)
+              .isNotEmpty) {
         setState(() {
           _reactionPadding = _reactionPickerKey.currentContext.size.height;
         });
@@ -624,7 +623,7 @@ class _MessageWidgetState extends State<MessageWidget> {
     EdgeInsetsGeometry padding,
   }) {
     Widget failedWidget;
-    if (widget.message.status == MessageSendingStatus.FAILED)
+    if (widget.message.status == MessageSendingStatus.FAILED) {
       failedWidget = Text(
         'MESSAGE FAILED · CLICK TO TRY AGAIN',
         style: widget.messageTheme.messageText.copyWith(
@@ -634,7 +633,8 @@ class _MessageWidgetState extends State<MessageWidget> {
           fontSize: 11,
         ),
       );
-    if (widget.message.status == MessageSendingStatus.FAILED_UPDATE)
+    }
+    if (widget.message.status == MessageSendingStatus.FAILED_UPDATE) {
       failedWidget = Text(
         'MESSAGE UPDATE FAILED · CLICK TO TRY AGAIN',
         style: widget.messageTheme.messageText.copyWith(
@@ -644,7 +644,8 @@ class _MessageWidgetState extends State<MessageWidget> {
           fontSize: 11,
         ),
       );
-    if (widget.message.status == MessageSendingStatus.FAILED_DELETE)
+    }
+    if (widget.message.status == MessageSendingStatus.FAILED_DELETE) {
       failedWidget = Text(
         'MESSAGE DELETE FAILED · CLICK TO TRY AGAIN',
         style: widget.messageTheme.messageText.copyWith(
@@ -654,6 +655,7 @@ class _MessageWidgetState extends State<MessageWidget> {
           fontSize: 11,
         ),
       );
+    }
 
     if (failedWidget != null) {
       return Padding(

lib/src/utils.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 Future<void> launchURL(BuildContext context, String url) async {
@@ -12,3 +13,7 @@ Future<void> launchURL(BuildContext context, String url) async {
     );
   }
 }
+
+String getAttachmentHeroTag(Message message, Attachment attachment) {
+  return '${message.id}-${attachment.imageUrl ?? attachment.assetUrl ?? attachment.thumbUrl ?? attachment.ogScrapeUrl}';
+}

lib/src/video_attachment.dart

@@ -148,8 +148,8 @@ class _VideoAttachmentState extends State<VideoAttachment> {
 
   @override
   void dispose() {
-    _videoPlayerController.dispose();
-    _chewieController.dispose();
+    _videoPlayerController?.dispose();
+    _chewieController?.dispose();
     super.dispose();
   }
 }