diff --git a/CHANGELOG.md b/CHANGELOG.md index 472f307..7bf43ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.6.0 + +- BREAKING CHANGE: Updated version numbers for Firebase dependencies. This may require you to update + your build versions on Android and iOS. +- Fix audio messages not working. + ## 0.5.0 - Added the `onUrlNavigation` callback to the ChatBox diff --git a/example/push_notifications/android/app/build.gradle b/example/push_notifications/android/app/build.gradle index 671066c..adef328 100644 --- a/example/push_notifications/android/app/build.gradle +++ b/example/push_notifications/android/app/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -46,7 +46,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.talkjs.flutter_push_example" minSdkVersion 19 - targetSdkVersion flutter.targetSdkVersion + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/example/push_notifications/android/app/src/main/AndroidManifest.xml b/example/push_notifications/android/app/src/main/AndroidManifest.xml index 1869044..2372deb 100644 --- a/example/push_notifications/android/app/src/main/AndroidManifest.xml +++ b/example/push_notifications/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + + 8.15.0) - - firebase_core (1.16.0): - - Firebase/CoreOnly (= 8.15.0) + - FirebaseMessaging (~> 10.2.0) + - firebase_core (2.3.0): + - Firebase/CoreOnly (= 10.2.0) - Flutter - - firebase_messaging (11.3.0): - - Firebase/Messaging (= 8.15.0) + - firebase_messaging (14.1.1): + - Firebase/Messaging (= 10.2.0) - firebase_core - Flutter - - FirebaseCore (8.15.0): - - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (8.15.0): - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (~> 2.30908.0) - - FirebaseInstallations (8.15.0): - - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseMessaging (8.15.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Reachability (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) - - nanopb (~> 2.30908.0) + - FirebaseCore (10.2.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreInternal (10.2.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseInstallations (10.2.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - PromisesObjC (~> 2.1) + - FirebaseMessaging (10.2.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Reachability (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - nanopb (< 2.30910.0, >= 2.30908.0) - Flutter (1.0.0) - flutter_apns_only (0.0.1): - Flutter - flutter_local_notifications (0.0.1): - Flutter - - GoogleDataTransport (9.1.4): + - GoogleDataTransport (9.2.0): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUtilities/AppDelegateSwizzler (7.10.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.10.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.10.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.10.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.10.0)" + - GoogleUtilities/Reachability (7.10.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.10.0): - GoogleUtilities/Logger - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) - - PromisesObjC (2.1.0) - - webview_flutter_wkwebview (0.0.1): + - nanopb (2.30909.0): + - nanopb/decode (= 2.30909.0) + - nanopb/encode (= 2.30909.0) + - nanopb/decode (2.30909.0) + - nanopb/encode (2.30909.0) + - PromisesObjC (2.1.1) + - talkjs_webview_flutter_wkwebview (0.0.4): - Flutter DEPENDENCIES: @@ -75,13 +72,13 @@ DEPENDENCIES: - Flutter (from `Flutter`) - flutter_apns_only (from `.symlinks/plugins/flutter_apns_only/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - talkjs_webview_flutter_wkwebview (from `.symlinks/plugins/talkjs_webview_flutter_wkwebview/ios`) SPEC REPOS: trunk: - Firebase - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreInternal - FirebaseInstallations - FirebaseMessaging - GoogleDataTransport @@ -100,26 +97,26 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_apns_only/ios" flutter_local_notifications: :path: ".symlinks/plugins/flutter_local_notifications/ios" - webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + talkjs_webview_flutter_wkwebview: + :path: ".symlinks/plugins/talkjs_webview_flutter_wkwebview/ios" SPEC CHECKSUMS: - Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d - firebase_core: 6ef152b7d6a361e24105e2cc56ab458f1f8367fe - firebase_messaging: 09caf4347b3a73deb37ed31f284ca11cc6039541 - FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1 - FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb - FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd - FirebaseMessaging: 5e5118a2383b3531e730d974680954c679ca0a13 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Firebase: a3ea7eba4382afd83808376edb99acdaff078dcf + firebase_core: db1432de826785171029b7c1a26e5b22ce1dd477 + firebase_messaging: 5babce6fa9ce1e0c63a854dabba227f23dc68b1b + FirebaseCore: 813838072b797b64f529f3c2ee35e696e5641dd1 + FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f + FirebaseInstallations: 004915af170935e3a583faefd5f8bc851afc220f + FirebaseMessaging: cc9f40f5b7494680f3844d08e517e92aa4e8d9f7 + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_apns_only: 3d91c0ca9dbef4439874858590909a19f8ed06a4 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 - GoogleDataTransport: 5fffe35792f8b96ec8d6775f5eccd83c998d5a3b - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72 - webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f + GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f + GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 + nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 + PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb + talkjs_webview_flutter_wkwebview: da8761436024d00892de6d282635e88117517da8 PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/example/push_notifications/ios/Runner.xcodeproj/project.pbxproj b/example/push_notifications/ios/Runner.xcodeproj/project.pbxproj index 40264f0..fa605d9 100644 --- a/example/push_notifications/ios/Runner.xcodeproj/project.pbxproj +++ b/example/push_notifications/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -69,7 +69,6 @@ C4CBC9746E6EE7515C340ECE /* Pods-Runner.release.xcconfig */, 5C1544F81B2A4CBA29DB5A02 /* Pods-Runner.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -342,7 +341,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -359,14 +358,14 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = GD339DZJKB; + DEVELOPMENT_TEAM = D52W9UWQGG; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.talkjs.flutterpushexample; + PRODUCT_BUNDLE_IDENTIFIER = com.talkjs.flutterexample; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -421,7 +420,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -470,7 +469,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -489,14 +488,14 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = GD339DZJKB; + DEVELOPMENT_TEAM = D52W9UWQGG; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.talkjs.flutterpushexample; + PRODUCT_BUNDLE_IDENTIFIER = com.talkjs.flutterexample; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -513,14 +512,14 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = GD339DZJKB; + DEVELOPMENT_TEAM = D52W9UWQGG; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.talkjs.flutterpushexample; + PRODUCT_BUNDLE_IDENTIFIER = com.talkjs.flutterexample; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/example/push_notifications/ios/Runner/Info.plist b/example/push_notifications/ios/Runner/Info.plist index 4004fee..0e21b2e 100644 --- a/example/push_notifications/ios/Runner/Info.plist +++ b/example/push_notifications/ios/Runner/Info.plist @@ -28,6 +28,7 @@ UIBackgroundModes + audio remote-notification UILaunchStoryboardName @@ -51,5 +52,7 @@ flutter_apns.disable_swizzling + NSMicrophoneUsageDescription + Your message to user when the microphone is accessed for the first time diff --git a/example/push_notifications/pubspec.lock b/example/push_notifications/pubspec.lock index 68c8a2b..8642cbe 100644 --- a/example/push_notifications/pubspec.lock +++ b/example/push_notifications/pubspec.lock @@ -1,20 +1,27 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.9" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.1" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -28,21 +35,28 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: + version: "1.2.1" + clock: dependency: transitive description: - name: charcode + name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" - clock: + version: "1.1.1" + cloud_firestore_platform_interface: dependency: transitive description: - name: clock + name: cloud_firestore_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "5.9.0" + cloud_firestore_web: + dependency: transitive + description: + name: cloud_firestore_web url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "3.1.0" collection: dependency: transitive description: @@ -63,77 +77,77 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" dbus: dependency: transitive description: name: dbus url: "https://pub.dartlang.org" source: hosted - version: "0.7.3" + version: "0.7.8" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "2.0.1" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.4" firebase_core: - dependency: "direct main" + dependency: transitive description: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "2.3.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.5.2" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.6.3" + version: "2.0.1" firebase_messaging: - dependency: "direct main" + dependency: transitive description: name: firebase_messaging url: "https://pub.dartlang.org" source: hosted - version: "11.3.0" + version: "14.1.1" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.4.0" + version: "4.2.7" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "3.2.7" flutter: dependency: "direct main" description: flutter @@ -145,7 +159,7 @@ packages: name: flutter_apns_only url: "https://pub.dartlang.org" source: hosted - version: "1.5.2" + version: "1.6.0" flutter_lints: dependency: "direct dev" description: @@ -159,14 +173,14 @@ packages: name: flutter_local_notifications url: "https://pub.dartlang.org" source: hosted - version: "9.6.0" + version: "9.9.1" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux url: "https://pub.dartlang.org" source: hosted - version: "0.5.0+1" + version: "0.5.1" flutter_local_notifications_platform_interface: dependency: transitive description: @@ -190,14 +204,14 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.4" + version: "0.13.5" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.2" js: dependency: transitive description: @@ -218,35 +232,35 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.4.0" + version: "5.1.0" platform: dependency: transitive description: @@ -260,7 +274,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" process: dependency: transitive description: @@ -279,7 +293,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -300,42 +314,49 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" talkjs_flutter: dependency: "direct main" description: path: "../.." relative: true source: path - version: "0.3.0" + version: "0.5.0" talkjs_webview_flutter: dependency: transitive description: name: talkjs_webview_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.0.7" talkjs_webview_flutter_android: dependency: transitive description: name: talkjs_webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.8.8" + version: "2.10.4" + talkjs_webview_flutter_wkwebview: + dependency: transitive + description: + name: talkjs_webview_flutter_wkwebview + url: "https://pub.dartlang.org" + source: hosted + version: "2.9.6" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" timezone: dependency: transitive description: @@ -349,7 +370,7 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" vector_math: dependency: transitive description: @@ -363,28 +384,21 @@ packages: name: webview_flutter_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" - webview_flutter_wkwebview: - dependency: transitive - description: - name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" - source: hosted - version: "2.7.4" + version: "1.9.5" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+1" + version: "0.2.0+2" xml: dependency: transitive description: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.3.1" + version: "6.1.0" sdks: - dart: ">=2.17.0-0 <3.0.0" - flutter: ">=2.8.1" + dart: ">=2.18.0 <3.0.0" + flutter: ">=3.0.0" diff --git a/example/push_notifications/pubspec.yaml b/example/push_notifications/pubspec.yaml index 2ec2729..b366961 100644 --- a/example/push_notifications/pubspec.yaml +++ b/example/push_notifications/pubspec.yaml @@ -34,8 +34,6 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - firebase_core: ^1.16.0 - firebase_messaging: ^11.3.0 talkjs_flutter: path: ../../ diff --git a/lib/src/chatbox.dart b/lib/src/chatbox.dart index 9ec472c..faa4e46 100644 --- a/lib/src/chatbox.dart +++ b/lib/src/chatbox.dart @@ -364,8 +364,7 @@ class ChatBoxState extends State { } String htmlData = await rootBundle.loadString('packages/talkjs_flutter/assets/index.html'); - Uri uri = Uri.dataFromString(htmlData, mimeType: 'text/html', encoding: Encoding.getByName('utf-8')); - webViewController.loadUrl(uri.toString()); + webViewController.loadHtmlString(htmlData, baseUrl: 'https://app.talkjs.com'); _webViewController = webViewController; } diff --git a/pubspec.lock b/pubspec.lock index fa624d1..5241f45 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.9" args: dependency: transitive description: @@ -14,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -28,7 +35,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -42,7 +49,21 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" + cloud_firestore_platform_interface: + dependency: transitive + description: + name: cloud_firestore_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "5.9.0" + cloud_firestore_web: + dependency: transitive + description: + name: cloud_firestore_web + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" collection: dependency: transitive description: @@ -70,7 +91,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" ffi: dependency: transitive description: @@ -91,42 +112,42 @@ packages: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "2.3.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.5.2" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.6.3" + version: "2.0.1" firebase_messaging: dependency: "direct main" description: name: firebase_messaging url: "https://pub.dartlang.org" source: hosted - version: "11.3.0" + version: "14.1.1" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.4.0" + version: "4.2.7" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "3.2.7" flutter: dependency: "direct main" description: flutter @@ -197,28 +218,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" petitparser: dependency: transitive description: @@ -239,7 +260,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" process: dependency: transitive description: @@ -258,7 +279,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -279,7 +300,7 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" talkjs_webview_flutter: dependency: "direct main" description: @@ -300,14 +321,14 @@ packages: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" timezone: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 37568fa..1c2c65a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: talkjs_flutter description: Official TalkJS SDK for Flutter -version: 0.5.0 +version: 0.6.0 homepage: https://talkjs.com environment: @@ -17,8 +17,8 @@ dependencies: talkjs_webview_flutter: ^3.0.0 crypto: ^3.0.1 - firebase_core: ^1.16.0 - firebase_messaging: ^11.3.0 + firebase_core: ^2.3.0 + firebase_messaging: ^14.1.1 flutter_local_notifications: ^9.6.0 http: ^0.13.4 flutter_apns_only: ^1.5.2