commit 8940f3c46e38974f71e581da357d640b0ba250e4
author Sébastien Blin <sebastien.blin@savoirfairelinux.com> Thu Jul 23 17:03:11 2020 -0400
committer Sébastien Blin <sebastien.blin@savoirfairelinux.com> Tue Aug 18 14:15:14 2020 -0400
tree 26e29a366f90776d41761323d75a6556e236da48
parent 5f35e19260cc854328c1d4f77465bd8a44062b6e

callview: redesign

Change-Id: I8ce1e02be798104aaca9d09d9dc5d931133ada6d

src/mainview/components/AudioCallPage.qml

diff --git a/src/mainview/components/AudioCallPage.qml b/src/mainview/components/AudioCallPage.qml
index 1292f30..9c3f46c 100644
--- a/src/mainview/components/AudioCallPage.qml
+++ b/src/mainview/components/AudioCallPage.qml
@@ -31,9 +31,7 @@
     property string bestName: "Best Name"
     property string bestId: "Best Id"
 
-    property var corrspondingMessageWebView: null
-
-    signal audioCallPageBackButtonIsClicked
+    property var linkedWebview: null
 
     function updateUI(accountId, convUid) {
         contactImgSource = "data:image/png;base64," + ClientWrapper.utilsAdaptor.getContactImageString(
@@ -44,19 +42,19 @@
         bestId = (bestName !== id) ? id : ""
     }
 
-    function setAudioCallPageCorrspondingMessageWebView(webViewId) {
-        corrspondingMessageWebView = webViewId
-        corrspondingMessageWebView.needToHideConversationInCall.disconnect(
+    function setLinkedWebview(webViewId) {
+        linkedWebview = webViewId
+        linkedWebview.needToHideConversationInCall.disconnect(
                     closeInCallConversation)
-        corrspondingMessageWebView.needToHideConversationInCall.connect(
+        linkedWebview.needToHideConversationInCall.connect(
                     closeInCallConversation)
     }
 
     function closeInCallConversation() {
         if (inAudioCallMessageWebViewStack.visible) {
-            corrspondingMessageWebView.resetMessagingHeaderBackButtonSource(
+            linkedWebview.resetMessagingHeaderBackButtonSource(
                         true)
-            corrspondingMessageWebView.setMessagingHeaderButtonsVisible(true)
+            linkedWebview.setMessagingHeaderButtonsVisible(true)
             inAudioCallMessageWebViewStack.visible = false
             inAudioCallMessageWebViewStack.clear()
         }
@@ -109,7 +107,7 @@
                                                             isVideoMuted,
                                                             isRecording, isSIP,
                                                             isConferenceCall)
-                        audioCallOverlay.bestName = bestName
+                        audioCallPageRect.bestName = bestName
                     }
 
                     function onShowOnHoldLabel(isPaused) {
@@ -118,34 +116,22 @@
                     }
                 }
 
-                onBackButtonIsClicked: {
-                    if (inAudioCallMessageWebViewStack.visible) {
-                        corrspondingMessageWebView.resetMessagingHeaderBackButtonSource(
-                                    true)
-                        corrspondingMessageWebView.setMessagingHeaderButtonsVisible(
-                                    true)
-                        inAudioCallMessageWebViewStack.visible = false
-                        inAudioCallMessageWebViewStack.clear()
-                    }
-                    audioCallPageRect.audioCallPageBackButtonIsClicked()
-                }
-
                 onOverlayChatButtonClicked: {
                     if (inAudioCallMessageWebViewStack.visible) {
-                        corrspondingMessageWebView.resetMessagingHeaderBackButtonSource(
+                        linkedWebview.resetMessagingHeaderBackButtonSource(
                                     true)
-                        corrspondingMessageWebView.setMessagingHeaderButtonsVisible(
+                        linkedWebview.setMessagingHeaderButtonsVisible(
                                     true)
                         inAudioCallMessageWebViewStack.visible = false
                         inAudioCallMessageWebViewStack.clear()
                     } else {
-                        corrspondingMessageWebView.resetMessagingHeaderBackButtonSource(
+                        linkedWebview.resetMessagingHeaderBackButtonSource(
                                     false)
-                        corrspondingMessageWebView.setMessagingHeaderButtonsVisible(
+                        linkedWebview.setMessagingHeaderButtonsVisible(
                                     false)
                         inAudioCallMessageWebViewStack.visible = true
                         inAudioCallMessageWebViewStack.push(
-                                    corrspondingMessageWebView)
+                                    linkedWebview)
                     }
                 }
             }