Merge branch 'feature/new-ui' of github.com:GetStream/stream-chat-flutter into feature/new-chat-screens

 Conflicts:
	example/pubspec.yaml
This commit is contained in:
xsahil03x
2020-11-20 19:36:24 +05:30
5 changed files with 12 additions and 2 deletions
+4
View File
@@ -282,6 +282,10 @@ class _AdvancedOptionsPageState extends State<AdvancedOptionsPage> {
}), }),
userToken, userToken,
); );
if (!kIsWeb) {
initNotifications(client);
}
} catch (e) { } catch (e) {
var errorText = 'Error connecting, retry'; var errorText = 'Error connecting, retry';
if (e is Map) { if (e is Map) {
+3
View File
@@ -33,6 +33,9 @@ void main() async {
User(id: userId), User(id: userId),
token, token,
); );
if (!kIsWeb) {
initNotifications(client);
}
} }
runApp(MyApp(client)); runApp(MyApp(client));
+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.62+64 version: 1.0.61+63
environment: environment:
sdk: ">=2.2.2 <3.0.0" sdk: ">=2.2.2 <3.0.0"
+2
View File
@@ -41,9 +41,11 @@ class _MediaListViewState extends State<MediaListView> {
AspectRatio( AspectRatio(
aspectRatio: 1.0, aspectRatio: 1.0,
child: FadeInImage( child: FadeInImage(
fadeInDuration: Duration(milliseconds: 300),
placeholder: MemoryImage(kTransparentImage), placeholder: MemoryImage(kTransparentImage),
image: MediaThumbnailProvider( image: MediaThumbnailProvider(
media: media, media: media,
highQuality: true,
), ),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
+2 -1
View File
@@ -35,7 +35,8 @@ dependencies:
flutter_slidable: ^0.5.4 flutter_slidable: ^0.5.4
carousel_slider: ^2.2.1 carousel_slider: ^2.2.1
clipboard: ^0.1.2+8 clipboard: ^0.1.2+8
media_gallery: ^0.1.5 media_gallery:
git: https://github.com/imtoori/media_gallery.git
permission_handler: ^5.0.1+1 permission_handler: ^5.0.1+1
transparent_image: ^1.0.0 transparent_image: ^1.0.0