capacitor-plugin-vonage 0.0.6 → 0.0.8

package/CapacitorPluginVonage.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
   #s.dependency 'OpenTok','2.25.0'
-  s.dependency 'OTXCFramework','2.26.2'
+  s.dependency 'OTXCFramework','2.27.0'
   s.swift_version = '5.1'
   s.static_framework = true
 end

package/android/build.gradle

@@ -72,4 +72,5 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.6.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.7.2'
     implementation "com.squareup.okhttp3:logging-interceptor:4.11.0"
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
 }

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

@@ -1,29 +1,36 @@
 package com.managemyhealth.plugin.vonage;
 
 
+
 import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import android.app.ActionBar;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.nfc.Tag;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
+import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.ViewModelProvider;
+
 
-import com.getcapacitor.JSObject;
+import com.getcapacitor.Bridge;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import com.opentok.android.BaseVideoRenderer;
 import com.opentok.android.OpentokError;
 import com.opentok.android.Publisher;
@@ -38,43 +45,81 @@ import com.opentok.android.SubscriberKit;
 import java.io.InputStream;
 import java.util.List;
 
-import okhttp3.OkHttpClient;
-import okhttp3.logging.HttpLoggingInterceptor;
-import okhttp3.logging.HttpLoggingInterceptor.Level;
+import javax.annotation.Nullable;
+
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;
-import retrofit2.Retrofit;
-import retrofit2.converter.moshi.MoshiConverterFactory;
 
 
-public class VideoCallActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
+public class VideoCallActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks  {
     private static final String TAG = VideoCallActivity.class.getSimpleName();
     private static final int PERMISSIONS_REQUEST_CODE = 124;
 
     public Session session;
+    private static Bridge staticBridge = null;
+
+    public static VideoCallActivity instance;
     private Publisher publisher;
     String SUBSCRIBERNAME ;
     String PUBLISHERNAME;
+    String profilePicApiUrl;
+    boolean isPatientOnline = false;
     boolean isMuted = false;
     boolean isCamOff = false;
+    public boolean temptest = false;
     boolean isTimeron = false;
     boolean isEndall = false;
     private Subscriber subscriber;
     private FrameLayout publisherViewContainer;
+    private LinearLayout ProviderViewLayout;
     private FrameLayout subscriberViewContainer;
     private FloatingActionButton fabCameraOff;
     private ImageView imageViewEndcall;
     private ImageView imageViewMute;
     private ImageView imageViewCamOff;
+    private ImageView circleAvatar;
+
     private ImageView imageViewCamSwitch;
+    public static Button sendNotifications ;
+    public static TextView patientStatus;
+    public static TextView publishernameView;
+    public static Button admit;
+    public static Button deny ;
+
+    private static final int LOG_INTERVAL_MILLIS = 1000; // Log every 100 milliseconds
+
+    private final Handler handler = new Handler();
+    private final Runnable logRunnable = new Runnable() {
+        @Override
+        public void run() {
+            Log.d(TAG, "Log message");
+//            if(temptest){
+//                Log.d(TAG, "temptest "+ temptest);
+//
+//            }else{
+//                Log.d(TAG, "temptest "+temptest);
+//
+//            }
+            handler.postDelayed(this, LOG_INTERVAL_MILLIS);
+        }
+    };
     Boolean ISPROVIDER = false;
+//    Boolean testobserver = false;
     private TextView timerTextView;
     private long startTime = 0;
+//    private List<Observer> observers;
+//    private List<String> observers1;
+//    public VideoCallActivity() {
+//        observers = new ArrayList<>();
+//        observers1 = new ArrayList<>();
+//    }
+
 
     private PublisherKit.PublisherListener publisherListener = new PublisherKit.PublisherListener() {
         @Override
         public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
             Log.d(TAG, "onStreamCreated: Publisher Stream Created. Own stream " + stream.getStreamId());
+
         }
 
         @Override
@@ -120,6 +165,25 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
         @Override
         public void onDisconnected(Session session) {
+            notifyObservers("deny");
+            if(publisher!=null) {
+
+                    publisher.setPublishAudio(false);
+                    imageViewMute.setImageResource(R.drawable.microphoneoff);
+
+            }
+                if(publisher!=null) {
+
+                        publisher.setPublishVideo(false);
+                        imageViewCamOff.setImageResource(R.drawable.cameraoff);
+                        imageViewCamSwitch.setVisibility(View.GONE);
+
+
+
+                }
+                VideoCallActivity temp = new VideoCallActivity();
+                temp.session = null;
+
             isTimeron=false;
 
             Log.d(TAG, "onDisconnected: Disconnected from session: " + session.getSessionId());
@@ -147,6 +211,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         public void onStreamReceived(Session session, Stream stream) {
 
             Log.d(TAG, "onStreamReceived: New Stream Received " + stream.getStreamId() + " in session: " + session.getSessionId());
+            ProviderViewLayout = findViewById(R.id.providerViewLayout);
+            if(ISPROVIDER) {
+                ProviderViewLayout.setVisibility(View.VISIBLE);
+            }
+            circleAvatar.setVisibility(View.GONE); // Hide the view
+            patientStatus.setVisibility(View.GONE); // Hide the view
+            publishernameView.setVisibility(View.GONE); // Hide the view
+
 
             if (subscriber == null) {
                 subscriber = new Subscriber.Builder(VideoCallActivity.this, stream).build();
@@ -170,8 +242,12 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
             Log.d(TAG, "onStreamDropped: Stream Dropped: " + stream.getStreamId() + " in session: " + session.getSessionId());
 
+                circleAvatar.setVisibility(View.VISIBLE); // Show the view
+
             if(!ISPROVIDER){
-                session.disconnect();
+                if(session!=null){
+                    session.disconnect();
+                }
                 if (subscriber != null) {
                     subscriber = null;
                     subscriberViewContainer.removeAllViews();
@@ -208,11 +284,15 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         public void onVideoDisabled(SubscriberKit subscriberKit, String s) {
             showToast(SUBSCRIBERNAME + " video disabled");
 
+            circleAvatar.setVisibility(View.VISIBLE); // Show the view
+
+
         }
 
         @Override
         public void onVideoEnabled(SubscriberKit subscriberKit, String s) {
             showToast(SUBSCRIBERNAME + " video enabled");
+            circleAvatar.setVisibility(View.GONE); // Hide the view
 
 
         }
@@ -239,6 +319,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         public void onDisconnected(SubscriberKit subscriberKit) {
             Log.d(TAG, "onDisconnected: Subscriber disconnected. Stream: " + subscriberKit.getStream().getStreamId());
 
+
         }
 
 
@@ -263,10 +344,12 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
     @Override
     public void onBackPressed() {
-        Log.d("onBack","Called===============");
-        session.disconnect();
+        if(session!=null){
+            session.disconnect();
+        }
     }
 
+
     @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -274,14 +357,24 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         Intent intent = getIntent();
 
         super.onCreate(savedInstanceState);
+//        observers = new ArrayList<>();
+//        observers1 = new ArrayList<>();
+        instance = new VideoCallActivity();
+        handler.post(logRunnable);
+
         setContentView(R.layout.video_call_layout);
-        new DownloadImageFromInternet((ImageView) findViewById(R.id.image_view)).execute("https://www.gravatar.com/avatar/?d=mp");
+        sendNotifications = findViewById(R.id.senddata);
+
+        circleAvatar =    findViewById(R.id.image_view);
 
         getSupportActionBar().hide();
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             actionBar.hide();
         }
+         patientStatus = findViewById(R.id.waiting);
+        admit = findViewById(R.id.admit);
+        deny = findViewById(R.id.deny);
 
         if (intent != null) {
             // Retrieve the data using the same key you used to put it in the Intent
@@ -290,17 +383,48 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             String API_KEY = intent.getStringExtra("apiKey");
              SUBSCRIBERNAME = intent.getStringExtra("subscriberName");
              PUBLISHERNAME = intent.getStringExtra("publisherName");
+            profilePicApiUrl = intent.getStringExtra("profilePicApiUrl");
+            Log.d("profilePicApiUrl",profilePicApiUrl);
+            isPatientOnline = intent.getBooleanExtra("isPatientOnline",false);
             ISPROVIDER = intent.getBooleanExtra("isProvider",false);
             publisherViewContainer = findViewById(R.id.publisher_container);
             subscriberViewContainer = findViewById(R.id.subscriber_container);
             TextView publisherNameTextView = findViewById(R.id.publisherName);
+            publishernameView = findViewById(R.id.publisherNameView);
             TextView subscriberNameTextView = findViewById(R.id.subscriberName);
+
+            if(ISPROVIDER){
+                if (isPatientOnline) {
+                    patientStatus.setText("WAITING");
+                    sendNotifications.setVisibility(View.GONE);
+                    admit.setVisibility(View.VISIBLE);
+                    deny.setVisibility(View.VISIBLE);
+                    patientStatus.setBackgroundColor(getResources().getColor(R.color.waiting));
+                } else {
+                    admit.setVisibility(View.GONE);
+                    deny.setVisibility(View.GONE);
+                    sendNotifications.setVisibility(View.VISIBLE);
+                    patientStatus.setText("OFFLINE");
+                    patientStatus.setBackgroundColor(getResources().getColor(R.color.offline));
+                }
+            }else{
+
+            }
             publisherNameTextView.setText(SUBSCRIBERNAME);
+            publishernameView.setText(SUBSCRIBERNAME);
+            publisherNameTextView.bringToFront();
             subscriberNameTextView.setText(PUBLISHERNAME);
             timerTextView = findViewById(R.id.timerTextView);
-        startTime = System.currentTimeMillis();
+            startTime = System.currentTimeMillis();
             isTimeron =true;
             startTimer();
+            ProviderViewLayout = findViewById(R.id.providerViewLayout);
+            if(ISPROVIDER){
+                ProviderViewLayout.setVisibility(View.VISIBLE);
+            }else{
+                ProviderViewLayout.setVisibility(View.GONE);
+            }
+            new urltoSource((ImageView) findViewById(R.id.image_view)).execute(profilePicApiUrl);
             initializeSession(API_KEY,SESSION_ID , TOKEN);
 
         }
@@ -312,11 +436,45 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         imageViewCamOff = findViewById(R.id.imageView3);
         imageViewCamSwitch = findViewById(R.id.imageView4);
 
-        imageViewEndcall.setOnClickListener(new View.OnClickListener() {
+
+
+        sendNotifications.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                notifyObservers("send");
+                sendNotifications.setVisibility(View.GONE);
+
+
+            }
+        });
+        admit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                notifyObservers("admit");
+                patientStatus.setText("Please wait");
+
+                admit.setVisibility(View.GONE);
+                deny.setVisibility(View.GONE);
 
+            }
+        });
+        deny.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                notifyObservers("deny");
                 session.disconnect();
+                admit.setVisibility(View.GONE);
+                deny.setVisibility(View.GONE);
+            }
+        });
+        imageViewEndcall.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(session!=null){
+                    session.disconnect();
+                }
+//                session.cl=
 
             }
         });
@@ -390,7 +548,9 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         }
     }
     public void endCall() {
-        session.disconnect();
+        if(session!=null){
+            session.disconnect();
+        }
 
         isEndall =true;
 //        killvc();
@@ -409,7 +569,6 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 //
 //    }
     private void startTimer() {
-//        startTime = System.currentTimeMillis();
         Handler handler = new Handler();
         handler.postDelayed(new Runnable() {
             @Override
@@ -421,9 +580,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 seconds %= 60;
                 minutes %= 60;
 
-                // Format the time as "00:00:00"
                 String timeString = String.format("%02d:%02d:%02d", hours, minutes, seconds);
-                Log.d(TAG, String.valueOf(currentTime));
+//                Log.d(TAG, String.valueOf(currentTime));
 
                 // Update the TextView with the formatted time
                 timerTextView.setText(timeString);
@@ -494,6 +652,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         session = new Session.Builder(this, apiKey, sessionId).build();
         session.setSessionListener(sessionListener);
         session.connect(token);
+//        circleAvatar.setVisibility(View.GONE); // Hide the view
+
         Log.d("initializeSession","session.toString()");
         Log.d("initializeSession",session.toString());
     }
@@ -516,23 +676,81 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 //    }
 
     private void showToast(String message) {
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+        try{
+            Toast toast = Toast.makeText(this, message, Toast.LENGTH_LONG);
+            View view = toast.getView();
+            int color = Color.parseColor("#1fc600");
+            int colorText = Color.parseColor("#ffffff");
+            view.getBackground().setColorFilter(Color.GREEN, PorterDuff.Mode.SRC_IN);
+            TextView text = view.findViewById(android.R.id.message);
+            text.setTextColor(Color.BLACK);
+            toast.setGravity(Gravity.TOP, 0, 0);
+            toast.show();
+        }catch(Exception e){
+            Log.d("toastlogex",e.toString());
+        }
     }
     private void finishWithMessage(String message) {
         Log.e(TAG, message);
 //        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
-        session.disconnect();
+        if(session!=null){
+            session.disconnect();
+        }
         Intent resultIntent = new Intent();
         String resultcode = ISPROVIDER?"999":"888";
         resultIntent.putExtra("result_key", resultcode);
         setResult(RESULT_OK, resultIntent);
         this.finish();
     }
-    private class DownloadImageFromInternet extends AsyncTask<String, Void, Bitmap> {
+
+
+
+    
+
+    public void patientStatusChanged(Boolean isOnline) {
+        Log.d("patientStatusChanged", String.valueOf(isOnline));
+        Log.d("patientStatusChanged2", String.valueOf(isOnline));
+        Log.d("patientStatusChanged2", String.valueOf(isOnline));
+
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                temptest= isOnline;
+                if(isOnline){
+                    Log.d("isOnline", String.valueOf(isOnline));
+
+                    patientStatus.setText("WAITING");
+                    sendNotifications.setVisibility(View.GONE);
+                    admit.setVisibility(View.VISIBLE);
+                    deny.setVisibility(View.VISIBLE);
+                    patientStatus.setBackgroundResource(R.color.waiting);
+//                    patientStatus.setBackgroundColor(getResources().getColor(R.color.waiting));
+                }else{
+                    Log.d("OFFLINE", String.valueOf(isOnline));
+                    patientStatus.setText("OFFLINE");
+                    admit.setVisibility(View.GONE);
+                    deny.setVisibility(View.GONE);
+                    sendNotifications.setVisibility(View.VISIBLE);
+                    patientStatus.setText("OFFLINE");
+                    patientStatus.setBackgroundResource(R.color.offline);
+//                    patientStatus.setBackgroundColor(getResources().getColor(R.color.offline));
+                }
+
+
+            }
+        });
+    }
+
+    public void notifyObservers(String value) {
+        vonagePlugin temp = new vonagePlugin();
+        temp.update(value);
+    }
+
+    private class urltoSource extends AsyncTask<String, Void, Bitmap> {
         ImageView imageView;
-        public DownloadImageFromInternet(ImageView imageView) {
+        public urltoSource(ImageView imageView) {
             this.imageView=imageView;
-            Toast.makeText(getApplicationContext(), "Please wait, it may take a few minute...",Toast.LENGTH_SHORT).show();
+//            Toast.makeText(getApplicationContext(), "Please wait, it may take a few minute...",Toast.LENGTH_SHORT).show();
         }
         protected Bitmap doInBackground(String... urls) {
             String imageURL=urls[0];

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

@@ -1,4 +1,6 @@
 package com.managemyhealth.plugin.vonage;
+import com.getcapacitor.Bridge;
+import com.getcapacitor.PluginHandle;
 import com.getcapacitor.annotation.ActivityCallback;
 import com.opentok.android.OpentokError;
 import com.opentok.android.Session;
@@ -7,11 +9,15 @@ import com.opentok.android.Stream;
 import com.opentok.android.Subscriber;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import androidx.activity.result.ActivityResult;
+import androidx.lifecycle.ViewModelProvider;
+
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
@@ -20,15 +26,53 @@ import com.getcapacitor.annotation.CapacitorPlugin;
 
 
 @CapacitorPlugin(name = "vonage",requestCodes = {999})
-public class vonagePlugin extends Plugin {
+public class vonagePlugin extends Plugin{
     String Tag = "VONAGETAG";
     Boolean isProvid=false;
+    Boolean videstarted=false;
     private Session session;
+    private static vonagePlugin instance;
+
+    public PluginCall endPluginCal;
+    private static Bridge staticBridge = null;
+
+    public static vonagePlugin getInstance() {
+        if (instance == null) {
+            instance = new vonagePlugin();
+        }
+        instance.videoCallStarted();
+        return instance;
+    }
+
 
     private String TAG = "Capacitor_Vonage_plugin";
 
-    @PluginMethod()
+    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
+    public void setPatientOnlineStatus(PluginCall call) {
+        final Boolean isOnline = call.getBoolean("isOnline");
+
+        Handler mainHandler = new Handler(Looper.getMainLooper());
+        Context appCon = this.bridge.getContext();
+        Runnable myRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try{
+//                    VideoCallActivity temp = new VideoCallActivity();
+                    VideoCallActivity.instance.patientStatusChanged(isOnline);
+                }catch (Exception e){
+                    showLog("temp");
+                    showLog(e.toString());
+                }
+            }
+        };
+        mainHandler.post(myRunnable);
+
+    }
+    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
     public void endVideoCall(PluginCall call) {
+
+
+
         showLog("endVideoCallPluginMethod");
 
 
@@ -48,42 +92,80 @@ public class vonagePlugin extends Plugin {
         mainHandler.post(myRunnable);
 
     }
-    @PluginMethod()
+    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
     public void openVideoCallWindow(PluginCall call) {
+        endPluginCal = call;
 
-        JSObject eventData = new JSObject();
-        eventData.put("key", "value test value");
-        final String API_KEY = call.getString("apiKey");
-        final String SESSION_ID =  call.getString("sessionId");
-        final String TOKEN =  call.getString("token");
-        final String PUBLISHERNAME =  call.getString("publisherName");
-        final String SUBSCRIBERNAME =  call.getString("subscriberName");
-        final Boolean ISPROVIDER =  call.getBoolean("isProvider");
-        isProvid = ISPROVIDER;
+       {
+            call.setKeepAlive(true);
+            JSObject eventData = new JSObject();
+            eventData.put("key", "value test value");
+            final String API_KEY = call.getString("apiKey");
+            final String SESSION_ID = call.getString("sessionId");
+            final String TOKEN = call.getString("token");
+            final String PUBLISHERNAME = call.getString("publisherName");
+            final String SUBSCRIBERNAME = call.getString("subscriberName");
+            final Boolean ISPROVIDER = call.getBoolean("isProvider");
+            final Boolean isPatientOnline = call.getBoolean("isPatientOnline");
+            final String profilePicApiUrl = call.getString("profilePhoto");
+            showLog("profilePicApiUrl");
+            showLog(profilePicApiUrl);
+            isProvid = ISPROVIDER;
 //        initializeSession(API_KEY, SESSION_ID, TOKEN);
-        Intent intent = new Intent(getContext(),    VideoCallActivity.class);
-        intent.putExtra("apiKey",API_KEY);
-        intent.putExtra("sessionId",SESSION_ID);
-        intent.putExtra("token",TOKEN);
-        intent.putExtra("subscriberName",SUBSCRIBERNAME);
-        intent.putExtra("publisherName",PUBLISHERNAME);
-        intent.putExtra("isProvider",ISPROVIDER);
-//        intent.putExtra("callbackIdentifier", );
-//        notifyListeners("onDataReceived", );
-//        StartedCall();
-        Handler handler = new Handler();
-        int delayMillis = 2000;
+            Intent intent = new Intent(getBridge().getActivity(), VideoCallActivity.class);
+            intent.putExtra("apiKey", API_KEY);
+            intent.putExtra("sessionId", SESSION_ID);
+            intent.putExtra("token", TOKEN);
+            intent.putExtra("subscriberName", SUBSCRIBERNAME);
+            intent.putExtra("publisherName", PUBLISHERNAME);
+            intent.putExtra("isProvider", ISPROVIDER);
+            intent.putExtra("isPatientOnline", isPatientOnline);
+            intent.putExtra("profilePicApiUrl", profilePicApiUrl);
+
+            Handler handler = new Handler();
+            int delayMillis = 2000;
 
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                eventData.put("isProvider", ISPROVIDER);
+
+                }
+            }, delayMillis);
+
+            eventData.put("isProvider", isProvid);
+            showLog("testing resolve endPluginCal");
+            endPluginCal.resolve(eventData);
+            this.startActivityForResult(call, intent, "onAcitivtyClosed");
+            call.setKeepAlive(false);
+        }
+
+    }
+        public void videoCallStarted() {
+
+        Handler handler = new Handler();
+        int delayMillis = 1000;
+            JSObject eventData1 = new JSObject();
+            eventData1.put("key", "value test value");
+            eventData1.put("isProvider", isProvid);
+            showLog("eventData");
+            showLog(eventData1.toString());
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
-                eventData.put("isProvider", ISPROVIDER);
-                notifyListeners("VideoCallStarted",eventData);
-                Log.d("VIDEOCALL","isProvider634");
+
+//                notifyListeners("VideoCallStarted",eventData1);
+                notifing("VideoCallStarted",eventData1);
+//                Log.d("VIDEOCALL00","isProvider634");
+
             }
         }, delayMillis);
-        startActivityForResult(call,intent,999);
-        call.resolve();
+    }
+    private void notifing(String text,JSObject obj){
+        Log.d("VIDEOCALL0","isProvider634");
+
+        notifyListeners(text,obj);
+        Log.d("VIDEOCALL00","isProvider634");
 
     }
 
@@ -158,4 +240,72 @@ public class vonagePlugin extends Plugin {
     private void showLog(String log){
         Log.d(Tag,log);
     }
+    private void test(PluginCall call){
+        JSObject eventData = new JSObject();
+        eventData.put("key", "value test value");
+        eventData.put("isProvider", isProvid);
+        showLog("updatevonageplugin called");
+        notifyListeners("VideoCallStarted",eventData);
+        showLog("updatevonageplugin called after");
+        call.resolve();
+    }
+    @ActivityCallback
+    private void onAcitivtyClosed(PluginCall call, ActivityResult result) {
+        if (call == null) {
+            JSObject eventData = new JSObject();
+            if (isProvid) {
+                eventData.put("isProvider", true);
+                notifyListeners("VideoCallEnded", eventData);
+            } else {
+                eventData.put("isProvider", false);
+                Log.d(TAG, "CODE 98 -----------");
+                notifyListeners("VideoCallEnded", eventData);
+            }
+            return;
+        }
+    }
+    @Override
+    public void load() {
+        super.load();
+        staticBridge = this.bridge;
+    }
+
+    public void update(final String value) {
+        if (value=="admit") {
+            vonagePlugin
+                    localNotificationsPlugin = vonagePlugin.getVonageLocalPluginInstance();
+            if (localNotificationsPlugin != null) {
+                JSObject eventData = new JSObject();
+                eventData.put("isProvider", true);
+                localNotificationsPlugin.notifyListeners("VideoCallStarted", eventData, true);
+            }
+        } else if(value=="deny") {
+            vonagePlugin
+                    localNotificationsPlugin = vonagePlugin.getVonageLocalPluginInstance();
+            if (localNotificationsPlugin != null){
+                JSObject eventData = new JSObject();
+                eventData.put("isProvider", true);
+                localNotificationsPlugin.notifyListeners("VideoCallEnded", eventData, true);
+            }
+        }else if(value =="send"){
+            vonagePlugin
+                    localNotificationsPlugin = vonagePlugin.getVonageLocalPluginInstance();
+            if (localNotificationsPlugin != null){
+                JSObject eventData = new JSObject();
+                eventData.put("isProvider", true);
+                localNotificationsPlugin.notifyListeners("SendNotification", eventData, true);
+            }
+
+        }
+    }
+    public static vonagePlugin getVonageLocalPluginInstance() {
+        if (staticBridge != null && staticBridge.getWebView() != null) {
+            PluginHandle handle = staticBridge.getPlugin("vonage");
+            if (handle == null) {
+                return null;
+            }
+            return (vonagePlugin) handle.getInstance();
+        }
+        return null;
+    }
 }

package/android/src/main/res/drawable/button_background.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <shape xmlns:android="http://schemas.android.com/apk/res/android">
+        <solid android:color="#DFF6ED"/> <!-- Set your desired background color -->
+        <corners android:radius="8dp"/> <!-- Set your desired border radius -->
+    <stroke
+        android:color="#60D2A7"
+    android:width="2dp"/>
+    </shape>
+

package/android/src/main/res/drawable/button_background2.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#E4EAED"/> <!-- Set your desired background color -->
+    <corners android:radius="8dp"/> <!-- Set your desired border radius -->
+    <stroke
+        android:color="#C4CBCF"
+        android:width="2dp"/>
+</shape>
+

package/android/src/main/res/drawable/circle_shape.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- res/drawable/circle_background.xml -->
+    <shape>
+        <solid android:color="#00FF00" />
+        <corners android:radius="500dp" />
+    </shape>
+
+</selector>

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

@@ -8,6 +8,8 @@
     android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
     tools:context=".VideoCallActivity">
 
+
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -36,14 +38,7 @@
                     android:id="@+id/subscriber_container"
                     android:layout_width="fill_parent"
                     android:layout_height="match_parent"
-                    android:background="#9b9c98" >
-
-                    <ImageView
-                        android:id="@+id/image_view"
-                        android:layout_width="150dp"
-                        android:layout_height="150dp"
-                        android:scaleType="centerCrop" />
-                </FrameLayout>
+                    android:background="#ffffff" />
 
                 <TextView
                     android:id="@+id/publisherName"
@@ -56,8 +51,7 @@
 
                     android:text="Publisher Name"
                     android:textColor="@android:color/white"
-                    android:textSize="16sp"
-                    android:visibility="visible" />
+                    android:textSize="16sp" />
                 <TextView
                     android:id="@+id/timerTextView"
                     android:layout_width="140dp"
@@ -79,42 +73,135 @@
                     android:layout_marginRight="16dp"
                     android:layout_marginBottom="80dp"
                     android:background="#9b9c98"
-                    android:layout_below="@id/subscriberName"
+                    android:layout_below="@id/publisherName"
 
                     android:padding="2dp" >
+                    <TextView
+                        android:id="@+id/subscriberName"
+                        android:layout_width="100dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical|bottom"
+                        android:paddingBottom="6dp"
+                        android:text="@string/subscriber_name"
+                        android:textColor="@android:color/white"
+                        android:visibility="visible"
+                        android:textSize="12sp" />
 
                 </FrameLayout>
-                <TextView
-                    android:id="@+id/subscriberName"
-                    android:layout_width="100dp"
+
+                <de.hdodenhof.circleimageview.CircleImageView
+                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/image_view"
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
+                    app:civ_border_width="2dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="130dp"
+                    android:visibility="visible"
+                    app:civ_border_color="#ffffff"/>
+                <LinearLayout
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/providerViewLayout"
+                    android:layout_width="match_parent"
+                    android:layout_marginTop="250dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|end"
-                    android:textSize="12sp"
-                    android:text="Subscriber Name"
-                    android:paddingBottom="25dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginBottom="80dp"
-                    android:textColor="@android:color/white" />
-                <androidx.cardview.widget.CardView
-                    android:layout_width="155dp"
-                    android:layout_height="155dp"
-                    app:cardCornerRadius="250dp"
-                    app:cardBackgroundColor="@android:color/white">
+                    android:orientation="vertical"
+                    android:gravity="center"
+                    android:padding="16dp">
+                    <TextView
+                        android:id="@+id/publisherNameView"
+                        android:layout_width="180dp"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="4dp"
+                        android:text="@string/publisher_name"
+                        android:textColor="#000000"
+                        android:textSize="18sp"
+                        android:gravity="center"
+                         />
+
+
+                    <TextView
+                        android:id="@+id/waiting"
+                        android:layout_width="80dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/waiting"
+                        android:textColor="#000000"
+                        android:paddingBottom="4dp"
+                        android:paddingTop="4dp"
+                        android:textSize="12sp"
+                        android:layout_marginTop="10dp"
+                        android:background="#DFF6ED"
+                        android:gravity="center_vertical|center_horizontal"
+                        tools:ignore="DuplicateIds" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center"
+
+                        android:padding="16dp">
+
+
+                        <!-- Button 1 -->
+                        <Button
+                            android:id="@+id/admit"
+                            android:layout_width="65dp"
+                            android:layout_height="35dp"
+                            android:background="@drawable/button_background"
+                            android:text="@string/admit"
+                            android:textColor="#000000"
+
+                            android:layout_marginEnd="8dp"/>
+
+                        <!-- Button 2 -->
+                        <Button
+                            android:id="@+id/deny"
+                            android:layout_width="65dp"
+                            android:layout_height="35dp"
+                            android:background="@drawable/button_background2"
+                            android:text="@string/deny"
+                            android:textColor="#000000"
+                            android:layout_marginStart="8dp"/>
+                        <Button
+                            android:id="@+id/senddata"
+                            android:layout_width="205dp"
+                            android:layout_height="35dp"
+                            android:background="@drawable/button_background"
+                            android:text="@string/sendvalue"
+                            android:textColor="#000000"
+                            android:layout_marginStart="8dp"/>
+
+
+
+                    </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center"
+
+                    android:padding="16dp">
+                    <!-- Button 3 -->
+
+
+                </LinearLayout>
 
-                    <androidx.cardview.widget.CardView
-                        android:layout_width="150dp"
-                        android:layout_height="150dp"
-                        app:cardCornerRadius="250dp"
-                        android:layout_gravity="center">
 
-                    </androidx.cardview.widget.CardView>
+                </LinearLayout>
+
+<!--                        <ImageView-->
+<!--                            android:layout_width="150dp"-->
+<!--                            android:layout_height="150dp"-->
+<!--                            android:scaleType="centerCrop"/>-->
+
 
-                </androidx.cardview.widget.CardView>
 
 
             </FrameLayout>
 
         </LinearLayout>
+
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guidelineBottom"
             android:layout_width="wrap_content"
@@ -125,7 +212,7 @@
             android:layout_width="fill_parent"
             android:layout_height="53dp"
             android:layout_alignParentBottom="false"
-            android:gravity="clip_horizontal"
+            android:gravity="clip_horizontal|center_horizontal"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="@+id/main"
             app:layout_constraintStart_toStartOf="parent"
@@ -134,40 +221,47 @@
             <!-- Image resource for the FAB -->
 
             <!-- Set the background image using android:background -->
-            <ImageView
-                android:id="@+id/imageView1"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_weight="1"
-                android:src="@drawable/callend"
-                android:contentDescription="EndCall"
-                />
+
             <ImageView
                 android:id="@+id/imageView4"
-                android:layout_width="0dp"
+                android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_weight="1"
                 android:contentDescription="Switch Camera"
                 android:src="@drawable/cameraswitch" />
+            <Space
+                android:layout_width="22dp"
+                android:layout_height="match_parent"/>
 
             <ImageView
                 android:id="@+id/imageView3"
-                android:layout_width="0dp"
+                android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_weight="1"
                 android:src="@drawable/cameraonwhite"
                 android:contentDescription="Camera On/Off"
                 />
+            <Space
+                android:layout_width="22dp"
+                android:layout_height="match_parent"/>
 
 
             <ImageView
                 android:id="@+id/imageView2"
-                android:layout_width="0dp"
+                android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_weight="1"
                 android:src="@drawable/microphoneonwhite"
                 android:contentDescription="Mute"
                 />
+            <Space
+                android:layout_width="22dp"
+                android:layout_height="match_parent"/>
+            <ImageView
+                android:id="@+id/imageView1"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@drawable/callend"
+                android:contentDescription="EndCall"
+                />
+
 
             ////////////////////////////
         </LinearLayout>

package/android/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="waiting">#DFF6ED</color>//DFF6ED
+    <color name="offline">#ffd6ca</color>//ffd6ca
+</resources>

package/android/src/main/res/values/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="subscriber_name">Subscriber Name</string>
+    <string name="admit">Admit</string>
+    <string name="deny">Deny</string>
+    <string name="sendvalue">SEND E-MAIL NOTIFICATION</string>
+    <string name="publisher_name">Publisher Name</string>
+    <string name="waiting">WAITING</string>
+</resources>

package/ios/Plugin/VideoChatViewController.swift

@@ -104,16 +104,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.addObserver(self, selector: #selector(deviceOrientationDidChange), name: UIDevice.orientationDidChangeNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(setPatientOnlineStatus), name: NSNotification.Name ("PatientOnlineStatus"), object: nil)
         NotificationCenter.default.addObserver(self,selector:#selector(endVideoCall(_:)),name: NSNotification.Name ("EndVideoCall"),object: nil)
-//        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0, execute: {
-//
-//            self.connectToAnOpenTokSession()
-//        })
-//        if(isVideoMute){
-//            subscriberImg.isHidden = true
-//        }else{
-//            subscriberImg.isHidden = false
-//        }
-       // turnOnAndOffVideo()
+
     }
     func showActivityIndicator() {
         activityView = UIActivityIndicatorView(style: .large)
@@ -132,11 +123,14 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         print("viewDidDisappear")
         super.viewDidDisappear(animated)
         let userInfo = ["userInfo": ["isProvider": self.isProvider]]
-        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-        
-       // NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
+        if(!isCallEnded){
+            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+            
+            // NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
+            
+            NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+        }
         NotificationCenter.default.removeObserver(self)
-        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
     }
     @objc func appMovedToBackground() {
         print("App moved to background!")
@@ -177,11 +171,13 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
     }
     func startTimer(){
-        timer.invalidate()
+        if(timer != nil && timer.isValid){
+            timer.invalidate()
+        }
         timer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(timerAction), userInfo: nil, repeats: true)
     }
     func stopTimer(){
-        if(timer.isValid){
+        if(timer != nil && timer.isValid){
             timer.invalidate()
             counter = 0
         }
@@ -440,10 +436,11 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         let userInfo = ["userInfo": ["isProvider": isProvider]]
        
         NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-        self.session?.disconnect(nil)
-        self.stopTimer()
-        self.dismiss(animated: true, completion: nil)
-        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+//        self.session?.disconnect(nil)
+//        self.stopTimer()
+//        self.dismiss(animated: true, completion: nil)
+//        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+        self.endVonageCall()
     }
     
     @objc func callBtnbuttonClicked() {
@@ -565,6 +562,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
             return
         }
         
+        if !stream.hasAudio {
+            print("Stream audio \(stream.hasAudio)")
+        }
         self.subscriber = subscriber
         var error: OTError?
         session.subscribe(subscriber, error: &error)
@@ -685,12 +685,10 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
         DispatchQueue.main.async {
             print("video ended called")
-            self.session?.disconnect(nil)
-            
 //            self.publisher?.publishVideo = false
             self.publisher?.videoCapture?.stop()
 //            self.publisher?.publishAudio = false
-            
+            self.session?.disconnect(nil)
             self.cleanupSubscriber()
             self.cleanupPublisher()
             self.stopTimer()

package/package.json

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