photobooth: recover the functionality of photo taken with flash

Gitlab: #187
Change-Id: I2d6cc19a68438accff89598e5b6866649ae5a511

src/commoncomponents/AvatarImage.qml

@@ -65,6 +65,7 @@ Item {
     property alias presenceStatus: presenceIndicator.status
     property bool showPresenceIndicator: true
     property int unreadMessagesCount: 0
+    property bool enableAnimation: true
 
     signal imageIsReady
 
@@ -97,8 +98,13 @@ Item {
 
         onStatusChanged: {
             if (status === Image.Ready) {
+                if (enableAnimation) {
                     rootImageOverlay.state = ""
                     rootImageOverlay.state = "rootImageLoading"
+                } else {
+                    rootImageOverlay.source = rootImage.source
+                    root.imageIsReady()
+                }
             }
         }
 
@@ -122,6 +128,8 @@ Item {
 
             fillMode: Image.PreserveAspectFit
 
+            opacity: enableAnimation ? 1 : 0
+
             onOpacityChanged: {
                 if (opacity === 0)
                     source = rootImage.source
@@ -140,7 +148,11 @@ Item {
             }
 
             transitions: Transition {
-                NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad; duration: 400}
+                NumberAnimation {
+                    properties: "opacity"
+                    easing.type: Easing.InOutQuad
+                    duration: 400
+                }
             }
         }
     }

src/commoncomponents/PhotoboothView.qml

@@ -28,9 +28,10 @@ ColumnLayout {
                                 buttonsRowLayout.height +
                                 JamiTheme.preferredMarginSize / 2
 
-    function initUI() {
+    function initUI(useDefaultAvatar = true) {
         photoState = PhotoboothView.PhotoState.Default
         avatarSet = false
+        if (useDefaultAvatar)
             setAvatarImage(AvatarImage.Mode.Default, "")
     }
 
@@ -49,6 +50,11 @@ ColumnLayout {
 
     function setAvatarImage(mode = AvatarImage.Mode.FromAccount,
                             imageId = AccountAdapter.currentAccountId){
+        if (mode !== AvatarImage.Mode.FromUrl)
+            avatarImg.enableAnimation = true
+        else
+            avatarImg.enableAnimation = false
+
         avatarImg.mode = mode
 
         if (mode === AvatarImage.Mode.Default) {
@@ -109,7 +115,7 @@ ColumnLayout {
             id: avatarLabelBackground
 
             anchors.fill: parent
-            color: "grey"
+            color: "white"
             radius: height / 2
 
             AvatarImage {
@@ -135,7 +141,14 @@ ColumnLayout {
                 }
 
                 onImageIsReady: {
-                    // Once image is loaded (updated), save to boothImg
+                    if (mode === AvatarImage.Mode.FromUrl)
+                        photoState = PhotoboothView.PhotoState.Taken
+
+                    if (photoState === PhotoboothView.PhotoState.Taken) {
+                        avatarImg.state = ""
+                        avatarImg.state = "flashIn"
+                    } else {
+                        // Once image is loaded (updated), save to boothImg (choose from file)
                         avatarImg.grabToImage(function(result) {
                             if (mode !== AvatarImage.Mode.Default)
                                 boothImg = result.image
@@ -145,6 +158,29 @@ ColumnLayout {
                         })
                     }
                 }
+
+                onOpacityChanged: {
+                    if (avatarImg.state === "flashIn" && opacity === 0)
+                        avatarImg.state = "flashOut"
+                }
+
+                states: [
+                    State {
+                        name: "flashIn"
+                        PropertyChanges { target: avatarImg; opacity: 0}
+                    }, State {
+                        name: "flashOut"
+                        PropertyChanges { target: avatarImg; opacity: 1}
+                    }]
+
+                transitions: Transition {
+                    NumberAnimation {
+                        properties: "opacity"
+                        easing.type: Easing.Linear
+                        duration: 100
+                    }
+                }
+            }
         }
     }
 
@@ -172,22 +208,6 @@ ColumnLayout {
                 }
             }
         }
-
-        Label {
-            id: flashOverlay
-
-            anchors.fill: previewWidget
-            visible: false
-            color: JamiTheme.whiteColor
-
-            OpacityAnimator on opacity {
-                id: flashAnimation
-
-                from: 1
-                to: 0
-                duration: 600
-            }
-        }
     }
 
     RowLayout {
@@ -235,15 +255,14 @@ ColumnLayout {
                     startBooth()
                     return
                 } else {
-                    // show flash overlay
-                    flashOverlay.visible = true
-                    flashAnimation.restart()
-
                     previewWidget.grabToImage(function(result) {
+                        boothImg = result.image
+
+                        if (saveToConfig)
+                            SettingsAdapter.setCurrAccAvatar(result.image)
 
                         setAvatarImage(AvatarImage.Mode.FromUrl, result.url)
 
-                        photoState = PhotoboothView.PhotoState.Taken
                         avatarSet = true
                         stopBooth()
                     })

src/settingsview/SettingsView.qml

@@ -53,9 +53,6 @@ Rectangle {
                 pageIdCurrentAccountSettings.connectCurrentAccount()
                 settingsViewRect.stopPreviewing()
                 selectedMenu = sel
-                if(pageIdCurrentAccountSettings.isPhotoBoothOpened()) {
-                    settingsViewRect.setAvatar()
-                }
                 pageIdCurrentAccountSettings.updateAccountInfoDisplayed()
                 break
             case SettingsView.General:
@@ -123,7 +120,6 @@ Rectangle {
 
         signal stopPreviewing
         signal stopBooth
-        signal setAvatar
 
         property bool isSIP: {
             switch (profileType) {

src/settingsview/components/AccountProfile.qml

@@ -38,21 +38,14 @@ ColumnLayout {
         function onStopBooth() {
             stopBooth()
         }
-
-        function onSetAvatar() {
-            setAvatar()
-        }
     }
 
     function updateAccountInfo() {
         displayNameLineEdit.text = SettingsAdapter.getCurrentAccount_Profile_Info_Alias()
     }
 
-    function isPhotoBoothOpened() {
+    function initPhotoBooth() {
-        return currentAccountAvatar.takePhotoState
+        currentAccountAvatar.initUI(false)
-    }
-
-    function setAvatar() {
         currentAccountAvatar.setAvatarImage()
     }
 

src/settingsview/components/CurrentAccountSettings.qml

@@ -43,12 +43,8 @@ Rectangle {
     signal navigateToNewWizardView
     signal advancedSettingsToggled(bool settingsVisible)
 
-    function isPhotoBoothOpened() {
-        return accountProfile.isPhotoBoothOpened()
-    }
-
     function updateAccountInfoDisplayed() {
-        accountProfile.setAvatar()
+        accountProfile.initPhotoBooth()
 
         accountEnableCheckBox.checked = SettingsAdapter.get_CurrentAccountInfo_Enabled()
         accountProfile.updateAccountInfo()