diff --git a/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 8ec56ee7..91797672 100644 Binary files a/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 2f7fdaa7..103da98b 100644 Binary files a/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 2c20055d..1718335e 100644 Binary files a/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 89492aaa..a111f507 100644 Binary files a/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index dd30e06e..fc254c25 100644 Binary files a/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/example/assets/android_icon.png b/example/assets/android_icon.png new file mode 100644 index 00000000..3b85d6c3 Binary files /dev/null and b/example/assets/android_icon.png differ diff --git a/example/assets/icon.png b/example/assets/ios_icon.png similarity index 100% rename from example/assets/icon.png rename to example/assets/ios_icon.png diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 1e7527eb..a08a18f6 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -842,4 +842,4 @@ /* End XCConfigurationList section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; -} +} \ No newline at end of file diff --git a/example/lib/advanced_options_page.dart b/example/lib/advanced_options_page.dart index 483e0902..e24bd5da 100644 --- a/example/lib/advanced_options_page.dart +++ b/example/lib/advanced_options_page.dart @@ -350,8 +350,7 @@ class _AdvancedOptionsPageState extends State { return MaterialApp( theme: ThemeData.light(), darkTheme: ThemeData.dark(), - //TODO change to system once dark theme is implemented - themeMode: ThemeMode.light, + themeMode: ThemeMode.system, builder: (context, widget) { return StreamChat( child: widget, diff --git a/example/lib/main.dart b/example/lib/main.dart index 018b2cab..8d436614 100644 --- a/example/lib/main.dart +++ b/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, diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 944be796..911d26d2 100644 --- a/example/pubspec.yaml +++ b/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" diff --git a/lib/src/image_group.dart b/lib/src/image_group.dart index 7bce22f9..e9b52f88 100644 --- a/lib/src/image_group.dart +++ b/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) - .colorTheme - .white, - fontSize: 28, + color: Colors.white, + fontSize: 26, ), ), ),