Use a single, reversible privacy screen transition

2 files changed, 4 insertions, 34 deletions

diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml

index 11ab27bd..204eb1bd 100644
--- a/resources/qml/PrivacyScreen.qml
+++ b/resources/qml/PrivacyScreen.qml
@@ -79,29 +79,9 @@ Item {
         ]
         transitions: [
             Transition {
-                from: "Visible"
-                to: "Invisible"
-
-                SequentialAnimation {
-                    NumberAnimation {
-                        target: screenSaver
-                        property: "opacity"
-                        duration: 250
-                        easing.type: Easing.InQuad
-                    }
-
-                    NumberAnimation {
-                        target: screenSaver
-                        property: "visible"
-                        duration: 0
-                    }
-
-                }
-
-            },
-            Transition {
                 from: "Invisible"
                 to: "Visible"
+                reversible: true
 
                 SequentialAnimation {
                     NumberAnimation {
@@ -113,7 +93,7 @@ Item {
                     NumberAnimation {
                         target: screenSaver
                         property: "opacity"
-                        duration: 500
+                        duration: 300
                         easing.type: Easing.InQuad
                     }
 
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml

index 1e2674ae..3d2981ca 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -88,24 +88,14 @@ AbstractButton {
         ]
         transitions: [
             Transition {
-                from: "Visible"
-                to: "Invisible"
-
-                NumberAnimation {
-                    target: blurhash_
-                    property: "opacity"
-                    duration: 250
-                    easing.type: Easing.InQuad
-                }
-            },
-            Transition {
                 from: "Invisible"
                 to: "Visible"
+                reversible: true
 
                 NumberAnimation {
                     target: blurhash_
                     property: "opacity"
-                    duration: 500
+                    duration: 300
                     easing.type: Easing.InQuad
                 }
             }