callview: hide mainview window on fullscreen

- hide / show mainview window on fullscreen switch in order to avoid undesirable UI transitions or incorrect layout (when working with multiple screens)
- update and show only on top page of callStackView
- back button always present on CallOverlay (use close button icon on fullscreen mode)

Gitlab: #135

Change-Id: I0d7c6aac26ba9c899ee97ac58f41f2746dda2148

src/constant/JamiQmlUtils.qml

@@ -22,6 +22,8 @@ pragma Singleton
 import QtQuick 2.14
 
 Item {
+    property bool callIsFullscreen: false
+
     TextMetrics {
         id: globalTextMetrics
     }

src/mainview/MainView.qml

@@ -201,7 +201,6 @@ Window {
             callStackView.setLinkedWebview(communicationPageMessageWebView)
             callStackView.responsibleAccountId = AccountAdapter.currentAccountId
             callStackView.responsibleConvUid = currentUID
-            callStackView.updateCorrespondingUI()
 
             if (callState === Call.Status.IN_PROGRESS || callState === Call.Status.PAUSED) {
                 UtilsAdapter.setCurrentCall(AccountAdapter.currentAccountId, currentUID)
@@ -210,12 +209,12 @@ Window {
                 else
                     callStackView.showVideoCallPage()
             } else if (callState === Call.Status.INCOMING_RINGING) {
-                callStackView.showIncomingCallPage(AccountAdapter.currentAccountId,
+                callStackView.showIncomingCallPage()
-                                                   currentUID)
             } else {
                 callStackView.showOutgoingCallPage(callState)
             }
             pushCallStackView()
+
         } else if (!inSettingsView) {
             if (currentConvUID !== currentUID) {
                 callStackView.needToCloseInCallConversationAndPotentialWindow()
@@ -250,6 +249,20 @@ Window {
         }
     }
 
+    Connections {
+        target: JamiQmlUtils
+
+        function onCallIsFullscreenChanged() {
+            if (JamiQmlUtils.callIsFullscreen) {
+                UtilsAdapter.setSystemTrayIconVisible(false)
+                mainViewWindow.hide()
+            } else {
+                UtilsAdapter.setSystemTrayIconVisible(true)
+                mainViewWindow.show()
+            }
+        }
+    }
+
     StackLayout {
         id: mainViewStackLayout
 

src/mainview/components/AudioCallPage.qml

@@ -33,8 +33,6 @@ Rectangle {
 
     property var linkedWebview: null
 
-    signal showFullScreenReqested
-
     function updateUI(accountId, convUid) {
         contactImage.updateImage(convUid)
         bestName = UtilsAdapter.getBestName(accountId, convUid)

src/mainview/components/CallOverlay.qml

@@ -172,7 +172,8 @@ Rectangle {
                 Layout.leftMargin: JamiTheme.preferredMarginSize
 
 
-                source: callStackView.isFullscreen ? "qrc:/images/icons/round-close-24px.svg" :
+                source: JamiQmlUtils.callIsFullscreen ?
+                            "qrc:/images/icons/round-close-24px.svg" :
                             "qrc:/images/icons/ic_arrow_back_24px.svg"
 
                 pressedColor: JamiTheme.invertedPressedButtonColor
@@ -183,10 +184,10 @@ Rectangle {
 
                 toolTipText: qsTr("Toggle to display side panel")
 
-                visible: mainViewWindow.sidePanelOnly
+                visible: true
 
                 onClicked: {
-                    if (callStackView.isFullscreen) {
+                    if (JamiQmlUtils.callIsFullscreen) {
                         callStackView.toggleFullScreen()
                     } else {
                         mainViewWindow.showWelcomeView()

src/mainview/components/CallStackView.qml

@@ -29,8 +29,6 @@ import "../js/callfullscreenwindowcontainercreation.js" as CallFullScreenWindowC
 Rectangle {
     id: callStackViewWindow
 
-    property bool isFullscreen: false
-
     enum StackNumber {
         IncomingPageStack,
         OutgoingPageStack,
@@ -53,33 +51,34 @@ Rectangle {
     property string responsibleAccountId: ""
 
     function needToCloseInCallConversationAndPotentialWindow() {
-        audioCallPage.closeInCallConversation()
-        videoCallPage.closeInCallConversation()
-
         // Close potential window, context menu releated windows.
+        if (callStackMainView.currentItem.stackNumber === CallStackView.AudioPageStack) {
+            audioCallPage.closeInCallConversation()
+            CallFullScreenWindowContainerCreation.closeVideoCallFullScreenWindowContainer()
             audioCallPage.closeContextMenuAndRelatedWindows()
-
+        } else if (callStackMainView.currentItem.stackNumber === CallStackView.VideoPageStack) {
+            videoCallPage.closeInCallConversation()
             CallFullScreenWindowContainerCreation.closeVideoCallFullScreenWindowContainer()
             videoCallPage.closeContextMenuAndRelatedWindows()
         }
-
-    function setLinkedWebview(webViewId) {
-        audioCallPage.setLinkedWebview(webViewId)
-        videoCallPage.setLinkedWebview(webViewId)
     }
 
-    function updateCorrespondingUI() {
+    function setLinkedWebview(webViewId) {
-        audioCallPage.updateUI(responsibleAccountId, responsibleConvUid)
+        if (callStackMainView.currentItem.stackNumber === CallStackView.AudioPageStack) {
-        outgoingCallPage.updateUI(responsibleAccountId, responsibleConvUid)
+            audioCallPage.setLinkedWebview(webViewId)
-        incomingCallPage.updateUI(responsibleAccountId, responsibleConvUid)
+        } else if (callStackMainView.currentItem.stackNumber === CallStackView.VideoPageStack) {
-        videoCallPage.updateUI(responsibleAccountId, responsibleConvUid)
+            videoCallPage.setLinkedWebview(webViewId)
+        }
+    }
+
+    function getItemFromStack(itemNumber) {
+        return callStackMainView.find(function (item) {
+            return item.stackNumber === itemNumber
+        })
     }
 
     function showAudioCallPage() {
-        var itemToFind = callStackMainView.find(function (item) {
+        var itemToFind = getItemFromStack(CallStackView.AudioPageStack)
-            return item.stackNumber === CallStackView.AudioPageStack
-        })
-
         if (!itemToFind) {
             callStackMainView.push(audioCallPage, StackView.Immediate)
         } else {
@@ -89,37 +88,27 @@ Rectangle {
     }
 
     function showOutgoingCallPage() {
-        var itemToFind = callStackMainView.find(function (item) {
+        var itemToFind = getItemFromStack(CallStackView.OutgoingPageStack)
-            return item.stackNumber === CallStackView.OutgoingPageStack
-        })
-
         if (!itemToFind) {
             callStackMainView.push(outgoingCallPage, StackView.Immediate)
         } else {
             callStackMainView.pop(itemToFind, StackView.Immediate)
         }
+        outgoingCallPage.updateUI(responsibleAccountId, responsibleConvUid)
     }
 
     function showIncomingCallPage(accountId, convUid) {
-        var itemToFind = callStackMainView.find(function (item) {
+        var itemToFind = getItemFromStack(CallStackView.IncomingPageStack)
-            return item.stackNumber === CallStackView.IncomingPageStack
-        })
-
         if (!itemToFind) {
             callStackMainView.push(incomingCallPage, StackView.Immediate)
         } else {
             callStackMainView.pop(itemToFind, StackView.Immediate)
         }
-        responsibleAccountId = accountId
+        incomingCallPage.updateUI(responsibleAccountId, responsibleConvUid)
-        responsibleConvUid = convUid
-        incomingCallPage.updateUI(accountId, convUid)
     }
 
     function showVideoCallPage() {
-        var itemToFind = callStackMainView.find(function (item) {
+        var itemToFind = getItemFromStack(CallStackView.VideoPageStack)
-            return item.stackNumber === CallStackView.VideoPageStack
-        })
-
         if (!itemToFind) {
             callStackMainView.push(videoCallPage, StackView.Immediate)
         } else {
@@ -132,8 +121,10 @@ Rectangle {
     }
 
     function toggleFullScreen() {
-        isFullscreen = !isFullscreen
+        JamiQmlUtils.callIsFullscreen = !JamiQmlUtils.callIsFullscreen
         var callPage = callStackMainView.currentItem
+        if (!callPage)
+            return
         CallFullScreenWindowContainerCreation.createvideoCallFullScreenWindowContainerObject()
 
         if (!CallFullScreenWindowContainerCreation.checkIfVisible()) {
@@ -144,9 +135,7 @@ Rectangle {
             CallFullScreenWindowContainerCreation.closeVideoCallFullScreenWindowContainer()
         }
 
-        if (callStackMainView.find(function (item) {
+        if (callPage.stackNumber === CallStackView.VideoPageStack) {
-            return item.stackNumber === CallStackView.VideoPageStack
-        })) {
             videoCallPage.handleParticipantsInfo(CallAdapter.getConferencesInfos())
         }
     }
@@ -155,23 +144,28 @@ Rectangle {
         target: CallAdapter
 
         function onCallStatusChanged(status, accountId, convUid) {
-            if (responsibleConvUid === convUid && responsibleAccountId === accountId) {
+            if (callStackMainView.currentItem.stackNumber === CallStackView.OutgoingPageStack
+                    && responsibleConvUid === convUid && responsibleAccountId === accountId) {
                 outgoingCallPage.callStatus = status
             }
         }
 
         function onUpdateParticipantsInfos(infos, accountId, callId) {
+            if (callStackMainView.currentItem.stackNumber === CallStackView.VideoPageStack) {
                 var responsibleCallId = UtilsAdapter.getCallId(responsibleAccountId, responsibleConvUid)
                 if (responsibleCallId === callId) {
                     videoCallPage.handleParticipantsInfo(infos)
                 }
             }
         }
+    }
 
     AudioCallPage {
         id: audioCallPage
 
         property int stackNumber: CallStackView.AudioPageStack
+
+        visible: callStackMainView.currentItem.stackNumber === stackNumber
     }
 
     OutgoingCallPage {
@@ -179,6 +173,8 @@ Rectangle {
 
         property int stackNumber: CallStackView.OutgoingPageStack
 
+        visible: callStackMainView.currentItem.stackNumber === stackNumber
+
         onCallCancelButtonIsClicked: {
             CallAdapter.hangUpACall(responsibleAccountId, responsibleConvUid)
         }
@@ -189,6 +185,7 @@ Rectangle {
 
         property int stackNumber: CallStackView.VideoPageStack
 
+        visible: callStackMainView.currentItem.stackNumber === stackNumber
     }
 
     IncomingCallPage {
@@ -205,6 +202,8 @@ Rectangle {
         onCallCancelButtonIsClicked: {
             CallAdapter.hangUpACall(responsibleAccountId, responsibleConvUid)
         }
+
+        visible: callStackMainView.currentItem.stackNumber === stackNumber
     }
 
     StackView {

src/mainview/components/CallViewContextMenu.qml

@@ -73,9 +73,10 @@ Item {
                                          })
 
         if (isAudioOnly && !isPaused)
-            ContextMenuGenerator.addMenuItem(callStackView.isFullscreen ? JamiStrings.exitFullScreen :
+            ContextMenuGenerator.addMenuItem(
+                        JamiQmlUtils.callIsFullscreen ? JamiStrings.exitFullScreen :
                                                          JamiStrings.fullScreen,
-                                             callStackView.isFullscreen ?
+                        JamiQmlUtils.callIsFullscreen ?
                             "qrc:/images/icons/close_fullscreen-24px.svg" :
                             "qrc:/images/icons/open_in_full-24px.svg",
                         function (){
@@ -83,9 +84,10 @@ Item {
                         })
 
         if (!isAudioOnly && !isPaused) {
-            ContextMenuGenerator.addMenuItem(callStackView.isFullscreen ? JamiStrings.exitFullScreen :
+            ContextMenuGenerator.addMenuItem(
+                        JamiQmlUtils.callIsFullscreen ? JamiStrings.exitFullScreen :
                                                         JamiStrings.fullScreen,
-                                             callStackView.isFullscreen ?
+                        JamiQmlUtils.callIsFullscreen ?
                             "qrc:/images/icons/close_fullscreen-24px.svg" :
                             "qrc:/images/icons/open_in_full-24px.svg",
                         function (){

src/mainview/components/VideoCallPage.qml

@@ -40,8 +40,6 @@ Rectangle {
 
     property var linkedWebview: null
 
-    signal showFullScreenReqested
-
     function updateUI(accountId, convUid) {
         videoCallOverlay.handleParticipantsInfo(CallAdapter.getConferencesInfos())
 

src/utilsadapter.cpp

@@ -22,6 +22,7 @@
 
 #include "utilsadapter.h"
 
+#include "globalsystemtray.h"
 #include "lrcinstance.h"
 #include "utils.h"
 #include "version.h"
@@ -381,3 +382,9 @@ UtilsAdapter::humanFileSize(qint64 fileSize)
 {
     return Utils::humanFileSize(fileSize);
 }
+
+void
+UtilsAdapter::setSystemTrayIconVisible(bool visible)
+{
+    GlobalSystemTray::instance().setVisible(visible);
+}

src/utilsadapter.h

@@ -80,6 +80,7 @@ public:
     Q_INVOKABLE QString getExt(const QString& path);
     Q_INVOKABLE bool isImage(const QString& fileExt);
     Q_INVOKABLE QString humanFileSize(qint64 fileSize);
+    Q_INVOKABLE void setSystemTrayIconVisible(bool visible);
 
 private:
     QClipboard* clipboard_;