From 7f7b33bfd2e1687d504d835aad2ad6f4b2f791c5 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 4 Jan 2021 13:44:35 +0100
Subject: [PATCH] merge feature/new-ui

---
 example/lib/main.dart     | 4 +---
 example/pubspec.yaml      | 2 +-
 lib/src/image_footer.dart | 8 ++++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/example/lib/main.dart b/example/lib/main.dart
index 74a6d808..b004271b 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,11 +1,9 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:example/choose_user_page.dart';
 import 'package:example/chat_info_screen.dart';
+import 'package:example/choose_user_page.dart';
 import 'package:example/group_info_screen.dart';
-import 'package:example/new_chat_screen.dart';
-import 'package:example/new_group_chat_screen.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 4f76c695..67ff213d 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,6 +1,6 @@
 name: example
 description: A new Flutter project.
-version: 1.0.106+109
+version: 1.0.107+110
 
 environment:
   sdk: ">=2.2.2 <3.0.0"
diff --git a/lib/src/image_footer.dart b/lib/src/image_footer.dart
index 46821ce2..3a6cfbcc 100644
--- a/lib/src/image_footer.dart
+++ b/lib/src/image_footer.dart
@@ -47,10 +47,14 @@ class ImageFooter extends StatefulWidget implements PreferredSizeWidget {
     this.message,
     this.videoPackages,
     this.mediaSelectedCallBack,
-  }) : super(key: key);
+  })  : preferredSize = Size.fromHeight(kToolbarHeight),
+        super(key: key);
 
   @override
   _ImageFooterState createState() => _ImageFooterState();
+
+  @override
+  final Size preferredSize;
 }
 
 class _ImageFooterState extends State<ImageFooter> {
@@ -164,7 +168,7 @@ class _ImageFooterState extends State<ImageFooter> {
     );
   }
 
-  void _buildPhotosModal(context) {
+  Widget _buildPhotosModal(context) {
     var videoAttachments = widget.mediaAttachments
         .where((element) => element.type == 'video')
         .toList();