Merge branch 'master' of github.com:hiennguyen92/flutter_callkit_inco…

…ming

# Conflicts:
#	PUSHKIT.md

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.1+1
+
+* Switch using Service for Ringtone(Android)
+* Fixed issue vibration(Android)
+* Add `getDevicePushTokenVoIP()` feature
+* Fixed some bugs.
+
 ## 1.0.1
 
 * Pustkit and VoIP setup instructions (PUSHKIT.md)

PUSHKIT.md

@@ -7,7 +7,8 @@ If you are making VoIP application than you definitely want to update your appli
 ## 🚀  Setup
 
 
-    Make sure when you create Bundle ID(https://developer.apple.com/account/resources/identifiers) for you have checked `Push Notifications`
+Make sure when you create Bundle ID(https://developer.apple.com/account/resources/identifiers) for app you have checked `Push Notifications`
+
 
 1. Enable Voice over IP Setting
   * Xcode Project > Capabilities

README.md

@@ -7,6 +7,7 @@ A Flutter plugin to show incoming call in your Flutter app(Custom for Android/Ca
 * Show an incoming call
 * Start an outgoing call
 * Custom UI Android/Callkit for iOS
+* Example using Pushkit/VoIP for iOS
 
   <br>
 
@@ -219,6 +220,7 @@ A Flutter plugin to show incoming call in your Flutter app(Custom for Android/Ca
       let data = flutter_callkit_incoming.Data(id: "44d915e1-5ff4-4bed-bf13-c423048ec97a", nameCaller: "Hien Nguyen", handle: "0123456789", type: 0)
       SwiftFlutterCallkitIncomingPlugin.sharedInstance?.showCallkitIncoming(data, fromPushKit: true)
     ```
+    <br>
 
     ```objc
       //Objective-C
@@ -232,12 +234,12 @@ A Flutter plugin to show incoming call in your Flutter app(Custom for Android/Ca
       Data * data = [[Data alloc]initWithId:@"44d915e1-5ff4-4bed-bf13-c423048ec97a" nameCaller:@"Hien Nguyen" handle:@"0123456789" type:1];
       [SwiftFlutterCallkitIncomingPlugin.sharedInstance showCallkitIncoming:data fromPushKit:YES];
     ```
+    <br>
 
     ```java
       //send custom event from native
       SwiftFlutterCallkitIncomingPlugin.sharedInstance?.sendEventCustom("customEvent", body: ["customKey": "customValue"])
 
-
     ```
 
 4. Properties

example/lib/main.dart

@@ -24,11 +24,10 @@ class _MyAppState extends State<MyApp> {
     initCurrentCall();
   }
 
-
   initCurrentCall() async {
     //check current call from pushkit if possible
     var calls = await FlutterCallkitIncoming.activeCalls();
-    if(calls is List && calls.isNotEmpty){
+    if (calls is List && calls.isNotEmpty) {
       this._currentUuid = calls[0]['id'];
     }
   }
@@ -79,6 +78,7 @@ class _MyAppState extends State<MyApp> {
             break;
           case CallEvent.ACTION_CALL_TOGGLE_AUDIO_SESSION:
             // TODO: only iOS
+            break;
           case CallEvent.ACTION_DID_UPDATE_DEVICE_PUSH_TOKEN_VOIP:
             // TODO: only iOS
             break;
@@ -140,7 +140,6 @@ class _MyAppState extends State<MyApp> {
               ),
               onPressed: () async {
                 this.endAllCalls();
-                this.getDevicePushTokenVoIP();
               },
             )
           ],
@@ -173,7 +172,10 @@ class _MyAppState extends State<MyApp> {
         'type': 0,
         'duration': 30000,
         'extra': <String, dynamic>{'userId': '1a2b3c4d'},
-        'headers': <String, dynamic>{'apiKey': 'Abc@123!', 'platform': 'flutter'},
+        'headers': <String, dynamic>{
+          'apiKey': 'Abc@123!',
+          'platform': 'flutter'
+        },
         'android': <String, dynamic>{
           'isCustomNotification': true,
           'isShowLogo': false,
@@ -232,8 +234,8 @@ class _MyAppState extends State<MyApp> {
   }
 
   Future<void> getDevicePushTokenVoIP() async {
-    var devicePushTokenVoIP = await FlutterCallkitIncoming.getDevicePushTokenVoIP();
+    var devicePushTokenVoIP =
+        await FlutterCallkitIncoming.getDevicePushTokenVoIP();
     print(devicePushTokenVoIP);
   }
-
 }

example/pubspec.lock

@@ -75,7 +75,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.0.1+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_callkit_incoming
 description: Flutter Callkit Incoming to show callkit screen in your Flutter app.
-version: 1.0.1
+version: 1.0.1+1
 homepage: https://github.com/hiennguyen92/flutter_callkit_incoming
 
 environment: