updates

CustomFlutterFirebaseMessagingService.java

@@ -0,0 +1,17 @@
+package io.flutter.plugins.firebasemessaging;
+
+import android.content.Intent;
+
+import com.google.firebase.messaging.RemoteMessage;
+
+public class CustomFlutterFirebaseMessagingService extends FlutterFirebaseMessagingService {
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        if (remoteMessage.getData().containsKey("is_call")) {
+            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
+            startActivity(intent);
+            super.onMessageReceived(remoteMessage);
+        } else
+            super.onMessageReceived(remoteMessage);
+    }
+}

android/CustomFlutterFirebaseMessagingService.java

@@ -0,0 +1,17 @@
+package io.flutter.plugins.firebasemessaging;
+
+import android.content.Intent;
+
+import com.google.firebase.messaging.RemoteMessage;
+
+public class CustomFlutterFirebaseMessagingService extends FlutterFirebaseMessagingService {
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        if (remoteMessage.getData().containsKey("is_call")) {
+            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
+            startActivity(intent);
+            super.onMessageReceived(remoteMessage);
+        } else
+            super.onMessageReceived(remoteMessage);
+    }
+}

lib/pages/conference/conference_button_bar.dart

@@ -212,6 +212,11 @@ class _ConferenceButtonBarState extends State<ConferenceButtonBar> with AfterLay
             key: Key('microphone-button'),
             onPressed: () => _onPressed(widget.onAudioEnabled),
           ),
+          CircleButton(
+            child: const Icon(Icons.switch_camera, color: Colors.white),
+            key: Key('switch-camera-button'),
+            onPressed: () => _onPressed(widget.onSwitchCamera),
+          ),
           CircleButton(
             radius: 35,
             child: const RotationTransition(
@@ -226,11 +231,6 @@ class _ConferenceButtonBarState extends State<ConferenceButtonBar> with AfterLay
             key: Key('hangup-button'),
             onPressed: () => _onPressed(widget.onHangup),
           ),
-          CircleButton(
-            child: const Icon(Icons.switch_camera, color: Colors.white),
-            key: Key('switch-camera-button'),
-            onPressed: () => _onPressed(widget.onSwitchCamera),
-          ),
         ],
       ),
     );

lib/pages/conference/conference_page.dart

@@ -217,21 +217,21 @@ class _ConferencePageState extends State<ConferencePage> {
       );
     }
 
-    if (length <= 3) {
+//    if (length <= 3) {
-      buildInCols(true, false, 1);
+//      buildInCols(true, false, 1);
-    } else if (length == 5) {
+//    } else if (length == 5) {
-      buildInCols(false, true, 2);
+//      buildInCols(false, true, 2);
-    } else if (length <= 6 || length == 8) {
+//    } else if (length <= 6 || length == 8) {
-      buildInCols(false, false, 2);
+//      buildInCols(false, false, 2);
-    } else if (length == 7 || length == 9) {
+//    } else if (length == 7 || length == 9) {
-      buildInCols(true, false, 2);
+//      buildInCols(true, false, 2);
-    } else if (length == 10) {
+//    } else if (length == 10) {
-      buildInCols(false, true, 3);
+//      buildInCols(false, true, 3);
-    } else if (length == 13 || length == 16) {
+//    } else if (length == 13 || length == 16) {
-      buildInCols(true, false, 3);
+//      buildInCols(true, false, 3);
-    } else if (length <= 18) {
+//    } else if (length <= 18) {
-      buildInCols(false, false, 3);
+//      buildInCols(false, false, 3);
-    }
+//    }
 
     return Column(
       children: children,

lib/pages/landing/landing_page.dart

@@ -13,6 +13,7 @@ import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
+import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
 import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
@@ -101,6 +102,18 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
     });
     pageController = PageController(keepPage: true);
     _firebaseMessaging.setAutoInitEnabled(true);
+
+    if (Platform.isIOS) {
+      _firebaseMessaging.requestNotificationPermissions(
+//        const IosNotificationSettings(
+//          sound: true,
+//          badge: true,
+//          alert: true,
+//          provisional: true,
+//        ),
+      );
+    }
+
     _firebaseMessaging.getToken().then((String token) {
       sharedPref.setString(PUSH_TOKEN, token);
       if (token != null) {
@@ -112,6 +125,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
     //_firebase Background message handler
     _firebaseMessaging.configure(
       onMessage: (Map<String, dynamic> message) async {
+        showDialog("onMessage: $message");
         print("onMessage: $message");
         print(message);
         print(message['name']);
@@ -182,19 +196,68 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
       onBackgroundMessage: Platform.isIOS ? null : myBackgroundMessageHandler,
       onLaunch: (Map<String, dynamic> message) async {
         print("onLaunch: $message");
+        showDialog("onLaunch: $message");
       },
       onResume: (Map<String, dynamic> message) async {
         print("onResume: $message");
+        print(message);
+        print(message['name']);
+        print(message['appointmentdate']);
+
+        showDialog("onResume: $message");
+
+        if (Platform.isIOS) {
+          if (message['is_call'] == "true") {
+            var route = ModalRoute.of(context);
+
+            if (route != null) {
+              print(route.settings.name);
+            }
+
+            Map<String, dynamic> myMap =
+            new Map<String, dynamic>.from(message);
+            print(myMap);
+            LandingPage.isOpenCallPage = true;
+            LandingPage.incomingCallData = IncomingCallData.fromJson(myMap);
+            if (!isPageNavigated) {
+              isPageNavigated = true;
+              Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => IncomingCall(
+                          incomingCallData: LandingPage.incomingCallData)))
+                  .then((value) {
+                isPageNavigated = false;
+              });
+            }
+          } else {
+            print("Is Call Not Found iOS");
+          }
+        } else {
+          print("Is Call Not Found iOS");
+        }
       },
     );
   }
 
+  showDialog(String message) {
+    ConfirmDialog dialog = new ConfirmDialog(
+        context: context,
+        confirmMessage: message,
+        okText: TranslationBase.of(context).confirm,
+        cancelText: TranslationBase.of(context).cancel_nocaps,
+        okFunction: () => {},
+        cancelFunction: () => {});
+    dialog.showAlertDialog(context);
+  }
+
   void requestPermissions() async {
     await [
       Permission.location,
       Permission.storage,
       Permission.camera,
       Permission.photos,
+      Permission.notification,
       Permission.accessMediaLocation
     ].request();
   }

lib/pages/login/login.dart

@@ -1,19 +1,14 @@
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
-import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_request.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_paitent_authentication_req.dart';
-import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart';
-import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
 import 'package:diplomaticquarterapp/pages/login/login-type.dart';
-import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/routes.dart';
+import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
-import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
-import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
 import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
 import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -21,7 +16,6 @@ import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_pro
 import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 
 class Login extends StatefulWidget {
   @override
@@ -41,9 +35,16 @@ class _Login extends State<Login> {
 
   @override
   void initState() {
+//    getDeviceToken();
     super.initState();
   }
 
+  getDeviceToken() async {
+    setState(() async {
+      nationalIDorFile.text = await sharedPref.getString(PUSH_TOKEN);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
@@ -184,20 +185,17 @@ class _Login extends State<Login> {
       request['PatientID'] = int.parse(nationalIDorFile.text);
     }
     // request.isRegister = false;
-    this
+    this.authService.checkActivationCode(request, code).then((result) => {
-        .authService
+          result = CheckActivationCode.fromJson(result),
-        .checkActivationCode(request, code)
+          this.sharedPref.setObject(USER_PROFILE, result.list),
-        .then((result) => {
+          this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
-              result = CheckActivationCode.fromJson(result),
+          this.sharedPref.setString(TOKEN, result.authenticationTokenID),
-              this.sharedPref.setObject(USER_PROFILE, result.list),
+          //this.checkIfUserAgreedBefore(result),
-              this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
+          Navigator.of(context).pushNamed(
-              this.sharedPref.setString(TOKEN, result.authenticationTokenID),
+            HOME,
-              //this.checkIfUserAgreedBefore(result),
+          )
-              Navigator.of(context).pushNamed(
+          // SMSOTP.showLoadingDialog(context, false),
-                HOME,
+        });
-              )
-              // SMSOTP.showLoadingDialog(context, false),
-            });
   }
 
   showLoader(bool isTrue) {