From 7c2d607a3a77335d9a120eeb2ae26ad1938d1a86 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Fri, 17 Apr 2020 16:05:32 +0200 Subject: [PATCH] version bump --- CHANGELOG.md | 4 +++ example/ios/Runner.xcodeproj/project.pbxproj | 12 ++++---- example/lib/main.dart | 32 +++++++++++--------- lib/src/stream_chat.dart | 4 +-- pubspec.yaml | 4 +-- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eff4dcb2..38b7ddcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.0-alpha+6 + +- Update llc dependency + ## 0.2.0-alpha+5 - Remove dependencies on notification service diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 54ee7f7f..7d0e7c88 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -433,7 +433,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.stream.flutter.Notifications; + PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter.Notifications; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -460,7 +460,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.stream.flutter.Notifications; + PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter.Notifications; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -485,7 +485,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.stream.flutter.Notifications; + PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter.Notifications; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -568,7 +568,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.stream.flutter; + PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -709,7 +709,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.stream.flutter; + PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -743,7 +743,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.stream.flutter; + PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/example/lib/main.dart b/example/lib/main.dart index 34830ac5..c2f5336a 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -17,7 +17,7 @@ void showLocalNotification(Message message, ChannelModel channel) async { initializationSettingsIOS, ); await flutterLocalNotificationsPlugin.initialize(initializationSettings); - flutterLocalNotificationsPlugin.show( + await flutterLocalNotificationsPlugin.show( message.id.hashCode, '${message.user.name} @ ${channel.name}', message.text, @@ -37,8 +37,6 @@ void showLocalNotification(Message message, ChannelModel channel) async { Future backgroundHandler(Map notification) async { final messageId = notification['data']['message_id']; - print('messageId: ${messageId}'); - final notificationData = await NotificationService.getAndStoreMessage(messageId); @@ -48,18 +46,7 @@ Future backgroundHandler(Map notification) async { ); } -void main() async { - final client = Client( - 's2dxdhpxd94g', - logLevel: Level.INFO, - showFakeNotification: Platform.isAndroid ? showLocalNotification : null, - ); - - await client.setUser( - User(id: 'user1'), - 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoidXNlcjEifQ.NGZPyPMx7KSVisJmh4tJhOIv7ZjCaMQpOh4gTINvCaU', - ); - +void _initNotifications(Client client) { final connector = createPushConnector(); connector.configure( onBackgroundMessage: backgroundHandler, @@ -74,6 +61,21 @@ void main() async { ); } }); +} + +void main() async { + final client = Client( + 's2dxdhpxd94g', + logLevel: Level.INFO, + showLocalNotification: Platform.isAndroid ? showLocalNotification : null, + ); + + await client.setUser( + User(id: 'user1'), + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoidXNlcjEifQ.NGZPyPMx7KSVisJmh4tJhOIv7ZjCaMQpOh4gTINvCaU', + ); + + _initNotifications(client); runApp(MyApp(client)); } diff --git a/lib/src/stream_chat.dart b/lib/src/stream_chat.dart index 6f27182e..b5db1f72 100644 --- a/lib/src/stream_chat.dart +++ b/lib/src/stream_chat.dart @@ -192,7 +192,7 @@ class StreamChatState extends State with WidgetsBindingObserver { @override void didChangeAppLifecycleState(AppLifecycleState state) { if (state == AppLifecycleState.paused) { - if (client.showFakeNotification != null) { + if (client.showLocalNotification != null) { _newMessageSubscription = client .on(EventType.messageNew) .where((e) => e.user.id != user.id) @@ -207,7 +207,7 @@ class StreamChatState extends State with WidgetsBindingObserver { await channel.query(); } - client.showFakeNotification( + client.showLocalNotification( event.message, ChannelModel( id: channel.id, diff --git a/pubspec.yaml b/pubspec.yaml index 48587097..ead788f8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: stream_chat_flutter homepage: https://github.com/GetStream/stream-chat-flutter description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter. -version: 0.2.0-alpha+5 +version: 0.2.0-alpha+6 environment: sdk: ">=2.3.0 <3.0.0" @@ -20,7 +20,7 @@ dependencies: file_picker: ^1.6.2 image_picker: ^0.6.5 flutter_keyboard_visibility: ^0.8.0 - stream_chat: ^0.2.0-alpha+3 + stream_chat: ^0.2.0-alpha+4 mime: ^0.9.6+3 visibility_detector: ^0.1.4 http_parser: ^3.1.4