Merge branch 'feature/new-ui' into feature/home-screen-fixes

example/ios/Runner.xcodeproj/project.pbxproj

@@ -842,4 +842,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}

example/lib/advanced_options_page.dart

@@ -350,8 +350,7 @@ class _AdvancedOptionsPageState extends State<AdvancedOptionsPage> {
                                   return MaterialApp(
                                     theme: ThemeData.light(),
                                     darkTheme: ThemeData.dark(),
-                                    //TODO change to system once dark theme is implemented
+                                    themeMode: ThemeMode.system,
-                                    themeMode: ThemeMode.light,
                                     builder: (context, widget) {
                                       return StreamChat(
                                         child: widget,

example/lib/main.dart

@@ -59,7 +59,7 @@ class MyApp extends StatelessWidget {
       debugShowCheckedModeBanner: false,
       theme: ThemeData.light(),
       darkTheme: ThemeData.dark(),
-      themeMode: ThemeMode.dark,
+      themeMode: ThemeMode.system,
       onGenerateRoute: AppRoutes.generateRoute,
       initialRoute:
           client.state.user == null ? Routes.CHOOSE_USER : Routes.HOME,

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: example
 description: A new Flutter project.
-version: 1.0.102+105
+version: 1.0.105+108
 
 environment:
   sdk: ">=2.2.2 <3.0.0"
@@ -22,7 +22,7 @@ dev_dependencies:
     sdk: flutter
   flutter_driver:
     sdk: flutter
-  flutter_launcher_icons: ^0.8.0
+  flutter_launcher_icons: ^0.8.1
   test: any
 
 flutter:
@@ -34,4 +34,5 @@ flutter:
 flutter_icons:
   android: true
   ios: true
-  image_path: "assets/icon.png"
+  image_path_android: "assets/android_icon.png"
+  image_path_ios: "assets/ios_icon.png"

lib/src/image_group.dart

@@ -1,6 +1,4 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:carousel_slider/carousel_options.dart';
-import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_flutter/src/full_screen_media.dart';
@@ -81,12 +79,10 @@ class ImageGroup extends StatelessWidget {
                                       color: Colors.black38,
                                       child: Center(
                                         child: Text(
-                                          '${images.length - 4} +',
+                                          '+ ${images.length - 4}',
                                           style: TextStyle(
-                                            color: StreamChatTheme.of(context)
+                                            color: Colors.white,
-                                                .colorTheme
+                                            fontSize: 26,
-                                                .white,
-                                            fontSize: 28,
                                           ),
                                         ),
                                       ),