Merge branch 'master' into prod

Author: cybex-dev

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.3+1
+
+* BREAKING CHANGE: Use `WebCallKitWeb` instead of `WebCallKit`.
+* update docs
+
 ## 0.0.3
 
 * BREAKING CHANGE: Update Callkit Models & Enums with `CK` prefix

NOTES.md

@@ -15,3 +15,10 @@ Future work may include:
 - Audio & VIDEO handling
 - Integration with native callkit frameworks
 
+### Regarding imports
+
+So, this is a tricky one I hope to resolve soon. For now, one should use the web_callkit_web.dart import instead of the web_callkit.dart import. 
+
+This is because the web_callkit.dart import is a stub for the web_callkit_web.dart import. This is due to multiple instances are created when calling `WebCallKit.instance` in a web OS environment. Even though a `WebCallKitWeb` object is created and registered with the plugin, it seems the Flutter still prefers the MethodChannel file filled with stubs.
+
+If you have a solution for this, please let me know. I would love to hear it or submit a PR addressing the issue. Note, the issue crops up in child dependencies of the plugin, e.g. [twilio_voice](https://pub.dev/packages/twilio_voice) but is not found in the example project.

README.md

@@ -45,7 +45,7 @@ for more information
 ### Import the package
 
 ```dart
-import 'package:web_callkit/web_callkit.dart';
+import 'package:web_callkit/web_callkit_web.dart';
 ```
 
 ### Display the system call screen
@@ -54,7 +54,7 @@ Inform the plugin that an incoming call is being received. This will hook into t
 notification system.
 
 ```dart
-WebCallKit.instance.displayIncomingCall(uuid: '1234',handle: 'John Doe',);
+WebCallKitWeb.instance.displayIncomingCall(uuid: '1234',handle: 'John Doe',);
 ```
 
 ### End the call
@@ -65,7 +65,7 @@ or disconnects with VoIP calls due to internet disruptions.
 
 The CallKit supports `DisconnectResponse` enum to specify the reason for the call disconnection.
 
-e.g. `WebCallKit.instance.reportCallDisconnected('1234', response: DisconnectResponse.local);`
+e.g. `WebCallKitWeb.instance.reportCallDisconnected('1234', response: DisconnectResponse.local);`
 
 | Reason   | Description                                                                           |
 |----------|---------------------------------------------------------------------------------------|
@@ -92,7 +92,7 @@ Incoming calls are displayed on the screen with the caller's name and number. Th
 customized with the caller's name, number, and profile picture.
 
 ```dart
-WebCallKit.instance.reportNewCall(uuid: '1234', handle: 'John Doe',);
+WebCallKitWeb.instance.reportNewCall(uuid: '1234', handle: 'John Doe',);
 ```
 
 ##### End Calls
@@ -101,7 +101,7 @@ End calls by calling the `endCall` method. This will remove the call screen and
 notification.
 
 ```dart
-WebCallKit.instance.reportCallDisconnected('1234', response:DisconnectResponse.local);
+WebCallKitWeb.instance.reportCallDisconnected('1234', response:DisconnectResponse.local);
 ```
 
 The response parameter is an enum of `DisconnectResponse` which specifies the reason for the call
@@ -145,7 +145,7 @@ The following describes the capabilities available:
 The following provides an example of how to report call capabilities:
 
 ```dart
-WebCallKit.instance.reportCallCapabilities('1234', capabilities: [CallCapability.hold, CallCapability.mute]);
+WebCallKitWeb.instance.reportCallCapabilities('1234', capabilities: [CallCapability.hold, CallCapability.mute]);
 ```
 
 #### Call Actions

lib/web_callkit_web.dart

@@ -30,12 +30,18 @@ import 'src/models/config/ck_configuration.dart';
 import 'src/platform_interface/web_callkit_platform_interface.dart';
 import 'src/utils/utils.dart';
 
+export 'src/src.dart';
+
 /// A web implementation of the WebCallkitPlatform of the WebCallkit plugin.
 class WebCallkitWeb extends WebCallkitPlatform {
   static const tag = 'web_callkit';
 
+  static final WebCallkitWeb _instance = WebCallkitWeb._internal();
+
+  static WebCallkitWeb get instance => _instance;
+
   static void registerWith(Registrar registrar) {
-    WebCallkitPlatform.instance = WebCallkitWeb();
+    WebCallkitPlatform.instance = WebCallkitWeb._internal();
   }
 
   final Map<String, CallTimer> _timers = {};
@@ -55,22 +61,23 @@ class WebCallkitWeb extends WebCallkitPlatform {
   OnCallTypeChangeListener? _onCallTypeChangeListener;
   OnDismissedListener? _onDismissedListener;
 
-  CKConfiguration _configuration;
+  late CKConfiguration _configuration;
   final Map<String, bool> _defaultFlags = {
     NotificationManager.CK_EXTRA_PERSIST: true,
   };
 
   /// The method channel used to interact with the native platform.
   // @visibleForTesting
   // final methodChannel = const MethodChannel('web_callkit');
+  factory WebCallkitWeb() {
+    return _instance;
+  }
+
+  WebCallkitWeb._internal() {
+    _callManager = CallManager();
+    _notificationManager = NotificationManagerImplWeb();
+    _configuration = WebCallkitPlatform.defaultConfiguration;
 
-  WebCallkitWeb({
-    CKConfiguration? configuration,
-  })  : /*_audioManager = audioManager ?? AudioManager(),*/
-        _callManager = CallManager(),
-        _notificationManager = NotificationManagerImplWeb(),
-        _configuration = configuration ?? WebCallkitPlatform.defaultConfiguration,
-        super() {
     _setupNotificationEventListeners();
     _callManager.setOnCallUpdate(_onCallUpdated);
   }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: web_callkit
 description: "Manage calls with an iOS-inspired Callkit for Flutter Web applications."
-version: 0.0.3
+version: 0.0.3+1
 homepage: "https://github.com/cybex-dev/web_callkit"
 platforms:
   web: