capacitor-plugin-vonage 0.1.0 → 0.1.2

package/android/src/main/java/com/managemyhealth/plugin/vonage/VideoCallActivity.java

@@ -25,6 +25,7 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -72,13 +73,15 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     boolean isPatientOnline = false;
     boolean isMuted = false;
     boolean isCamOff = false;
-    boolean isCallinprogress = false;
+    private static boolean isCallinprogress = false;
     public boolean temptest = false;
     boolean isTimeron = false;
     boolean isEndall = false;
     private Subscriber subscriber;
     private FrameLayout publisherViewContainer;
     private LinearLayout ProviderViewLayout;
+    private LinearLayout main;
+    private ProgressBar progressBar;
     private FrameLayout subscriberViewContainer;
     private  TextView publisherNameTextView;
     private FloatingActionButton fabCameraOff;
@@ -148,6 +151,9 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     private final Session.SessionListener sessionListener = new Session.SessionListener() {
         @Override
         public void onConnected(Session session) {
+            main.setVisibility(View.VISIBLE);
+            startTimer();
+            progressBar.setVisibility(View.INVISIBLE);
             publisher = new Publisher.Builder(VideoCallActivity.this).build();
             publisher.setPublisherListener(publisherListener);
             publisher.getRenderer().setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL);
@@ -315,6 +321,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         @Override
         public void onDisconnected(SubscriberKit subscriberKit) {
             Log.d(TAG, "onDisconnected: Subscriber disconnected. Stream: " + subscriberKit.getStream().getStreamId());
+            showToast(SUBSCRIBERNAME+" left the call");
 
 
         }
@@ -361,6 +368,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
         setContentView(R.layout.video_call_layout);
         sendNotifications = findViewById(R.id.senddata);
+        main = findViewById(R.id.main);
+        progressBar = findViewById(R.id.progressBar);
 
         circleAvatar =    findViewById(R.id.image_view);
 
@@ -414,7 +423,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             timerTextView = findViewById(R.id.timerTextView);
             startTime = System.currentTimeMillis();
             isTimeron =true;
-            startTimer();
+//            startTimer();
             ProviderViewLayout = findViewById(R.id.providerViewLayout);
             if(ISPROVIDER){
                 ProviderViewLayout.setVisibility(View.VISIBLE);
@@ -501,13 +510,13 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 if (!isCamOff) {
                     publisher.setPublishVideo(false);
                     imageViewCamOff.setImageResource(R.drawable.cameraoff);
-                    imageViewCamSwitch.setVisibility(View.GONE);
+//                    imageViewCamSwitch.setVisibility(View.GONE);
 
 
                 } else {
                     publisher.setPublishVideo(true);
                     imageViewCamOff.setImageResource(R.drawable.cameraonwhite);
-                    imageViewCamSwitch.setVisibility(View.VISIBLE);
+//                    imageViewCamSwitch.setVisibility(View.VISIBLE);
 
                 }
                 isCamOff = !isCamOff;
@@ -637,6 +646,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
 
     private void initializeSession(String apiKey, String sessionId, String token) {
+        instance.isCallinprogress= false;
         Log.i(TAG, "initializeSession: " + "initializeSession");
         Log.i(TAG, "apiKey: " + apiKey);
         Log.i(TAG, "sessionId: " + sessionId);
@@ -673,10 +683,10 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 //    }
 
     private void showToast(String message) {
-        try{
-            if(isAppInForeground()){
+//        try{
+//            if(isAppInForeground()){
             showGreenToast(getApplicationContext(),message);
-            }
+//            }
 //            Toast toast = Toast.makeText(this, message, Toast.LENGTH_LONG);
 //            View view = toast.getView();
 //            int color = Color.parseColor("#1fc600");
@@ -686,9 +696,9 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 //            text.setTextColor(Color.BLACK);
 //            toast.setGravity(Gravity.TOP, 0, 0);
 //            toast.show();
-        }catch(Exception e){
-            Log.d("toastlogex",e.toString());
-        }
+//        }catch(Exception e){
+//            Log.d("toastlogex",e.toString());
+//        }
     }
 
     private void finishWithMessage(String message) {
@@ -713,7 +723,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         Log.d("patientStatusChanged2", String.valueOf(isOnline));
         Log.d("patientStatusChanged2", String.valueOf(isOnline));
 
-        if(!isCallinprogress){
+        if(!instance.isCallinprogress){
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {

package/android/src/main/res/layout/custom_toast_green_layout.xml

@@ -4,15 +4,16 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp"
-    android:background="#00FF00">
+    android:padding="7dp"
+    android:background="#0B6623">
 
     <TextView
         android:id="@+id/toastView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Custom Toast"
-        android:textColor="#0B6623"
+        android:textSize="11sp"
+        android:textColor="#FFFFFF"
         android:textStyle="bold"
         android:layout_gravity="center_horizontal"/>
 </LinearLayout>

package/android/src/main/res/layout/video_call_layout.xml

@@ -15,11 +15,25 @@
         android:layout_height="match_parent"
         >
 
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="57dp"
+            android:layout_height="56dp"
+            android:layout_gravity="center"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/main"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
 
         <LinearLayout
             android:id="@+id/main"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:visibility="invisible"
             >
 
 
@@ -76,6 +90,7 @@
                     android:padding="2dp" >
 
 
+
                 </FrameLayout>
                 <TextView
                     android:id="@+id/subscriberName"

package/ios/Plugin/VideoChatViewController.swift

@@ -327,21 +327,23 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         
         self.view.addSubview(bottomView)
         
-        localView = UIView(frame: CGRect(x: screenWidth - 140, y: screenHeight - 250, width: 120, height: 120))
+        localView = UIView(frame: CGRect(x: screenWidth - 140, y: screenHeight - 260, width: 120, height: 120))
         localView.backgroundColor = UIColor(red: 31/255, green: 33/255, blue: 36/255, alpha: 1.0)
-        
+        localView.layer.borderColor = UIColor(hex: "#9b9c98").cgColor
+        localView.layer.borderWidth = 1.0
         localView.layer.cornerRadius = 10;
         localView.clipsToBounds  =  true
         localView.isHidden = true
         
-        publisherLabel = UILabel(frame: CGRect(x: 0, y: Int(localView.frame.size.height - 40.0), width: Int(localView.frame.size.width), height: 40))
-        publisherLabel.text = publisherName
+        publisherLabel = UILabel(frame: CGRect(x: Int(screenWidth - 160), y: Int(screenHeight - 140), width: 160, height: 40))
+        //publisherLabel.text = publisherName
         // publisherLabel.backgroundColor = UIColor(red: 31/255, green: 33/255, blue: 36/255, alpha: 1.0)
-        publisherLabel.textColor = .white//UIColor(hex: "#000000")
+        publisherLabel.textColor = .black//UIColor(hex: "#000000")
         publisherLabel.textAlignment = .center
         publisherLabel.layer.zPosition = 1;
         publisherLabel.font = publisherLabel.font.withSize(dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
-        localView.addSubview(publisherLabel)
+        remoteView.addSubview(publisherLabel)
+        //localView.addSubview(publisherLabel)
         self.view.addSubview(localView)
         
         callBtn = UIButton(frame: CGRect(x: 240, y: 0, width: 60, height: 60))
@@ -407,7 +409,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         subscriberStatusLabel.isHidden = false
         subscriberNameLabel.isHidden = false
         subscriberStatusLabel.text = "Please Wait.."
-        let userInfo = ["userInfo": ["isProvider": isProvider]]
+        let userInfo = ["isProvider": isProvider]
 //        NotificationCenter.default.post(name: NSNotification.Name("SendNotification"),object: nil,userInfo: userInfo)
         delegate?.videoCallSendNotification(userInfo)
 //        self.session?.disconnect(nil)
@@ -429,14 +431,14 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //        self.session?.disconnect(nil)
 //        self.stopTimer()
 //        self.dismiss(animated: true, completion: nil)
-        let userInfo = ["userInfo": ["isProvider": isProvider]]
+        let userInfo = ["isProvider": isProvider]
 //        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoStarted),object: nil,userInfo: userInfo)
         delegate?.videoCallStarted(userInfo)
     }
     @objc func denybuttonClicked() {
         print("deny button clicked")
         centerView.isHidden = true
-        let userInfo = ["userInfo": ["isProvider": isProvider]]
+        let userInfo = ["isProvider": isProvider]
        
        // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
         delegate?.videoCallEnded(userInfo)
@@ -449,7 +451,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     
     @objc func callBtnbuttonClicked() {
         
-        let userInfo = ["userInfo": ["isProvider": isProvider]]
+        let userInfo = ["isProvider": isProvider]
        // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
         delegate?.videoCallEnded(userInfo)
         self.endVonageCall()
@@ -512,7 +514,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         hideActivityIndicator()
         localView.isHidden = false
         print("The client connected to the OpenTok session.")
-        let userInfo = ["userInfo": ["isProvider": isProvider]]
+        let userInfo = ["isProvider": isProvider]
 //        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoStarted),object: nil,userInfo: userInfo)
         let settings = OTPublisherSettings()
         settings.cameraResolution = .high
@@ -538,7 +540,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         // let screenBounds = UIScreen.main.bounds
         //changed
         publisherView.frame = CGRect(x: 0, y: 0 , width: localView.frame.width, height: localView.frame.height)
-        
+        publisherLabel.text = publisherName
         localView.addSubview(publisherView)
         startTimer()
         DispatchQueue.main.async {
@@ -584,9 +586,8 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         if(stream.videoType == .screen){
             subscriberView.accessibilityValue = "from screen"
         }
-        adminBtn.isHidden = true
-        denyBtn.isHidden = true
-        sendNotificationBtn.isHidden = true
+        timerLabel.textColor = .white
+        publisherLabel.textColor = .white
         remoteView.addSubview(subscriberView)
     }
     
@@ -600,7 +601,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //        }
         if let subStream = subscriber?.stream, subStream.streamId == stream.streamId,!isProvider, stream.videoType != .screen {
                   // cleanupSubscriber()
-            let userInfo = ["userInfo": ["isProvider": isProvider]]
+            let userInfo = ["isProvider": isProvider]
            // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
             delegate?.videoCallEnded(userInfo)
            // self.session?.disconnect(nil)
@@ -645,7 +646,11 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         subscriberStatusLabel.isHidden = true
         subscriberNameLabel.isHidden = true
         timerLabel.textColor = .white
+        publisherLabel.textColor = .white
         isCallInProgress = true
+        adminBtn.isHidden = true
+        denyBtn.isHidden = true
+        sendNotificationBtn.isHidden = true
         if(subscriber.stream?.videoType != .screen){
             showToast(message: "\(subscriberName) is joined the call")
         }
@@ -673,6 +678,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         subscriberStatusLabel.isHidden = true
         subscriberNameLabel.isHidden = true
         timerLabel.textColor = .white
+        publisherLabel.textColor = .white
        // showToast(message: "is provider \(isProvider) video enabled")
 
         // Remove the video disabled indicator
@@ -688,6 +694,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     fileprivate func endVonageCall(){
         isCallEnded = true
+        self.stopTimer()
         //let userInfo = ["userInfo": ["isProvider": self.isProvider]]
        // NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
        // DispatchQueue.main.async {
@@ -695,16 +702,22 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //            self.publisher?.publishVideo = false
 //            self.publisher?.videoCapture?.stop()
 //            self.publisher?.publishAudio = false
-            self.session?.disconnect(nil)
+            
            // self.cleanupSubscriber()
             //self.cleanupPublisher()
-            self.stopTimer()
+        var error: OTError?
+        self.session?.disconnect(&error)
+        if error != nil {
+            print(error!)
+        }
             self.dismiss(animated: true) {
                 print("video ended")
             }
         //}
     }
     fileprivate func cleanupSubscriber() {
+        timerLabel.textColor = .black
+        publisherLabel.textColor = .black
            subscriber?.view?.removeFromSuperview()
            subscriber = nil
         remoteView.backgroundColor = .white

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-vonage",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "opentok sdk capacitor plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",