From 96745902f357c93809d5df3640e4350ca37a42a0 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Tue, 16 Jul 2019 12:53:52 -0400
Subject: [PATCH] Move header definition from EditAccount to HPage

---
 TODO.md                                   |  1 +
 src/qml/Base/HPage.qml                    | 38 +++++++++++++++++++++++
 src/qml/Pages/EditAccount/EditAccount.qml | 34 ++------------------
 src/qml/UI.qml                            |  1 +
 4 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/TODO.md b/TODO.md
index 5af32364..1395a1b9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,4 +1,5 @@
 - Way to round avatar corners to allow box radius
+- Devices and client settings in edit account page
 - If avatar is set, name color from average color?
 - Wrong avatar for group rooms
 - Reduce messages ListView cacheBuffer height once http thumbnails
diff --git a/src/qml/Base/HPage.qml b/src/qml/Base/HPage.qml
index 0ee79fed..1bb48ddb 100644
--- a/src/qml/Base/HPage.qml
+++ b/src/qml/Base/HPage.qml
@@ -11,6 +11,9 @@ SwipeView {
     property alias page: innerPage
     property alias flickable: innerFlickable
 
+    property alias headerLabel: innerHeaderLabel
+    property var hideHeaderUnderHeight: null
+
     property bool wide: width > 414 + leftPadding + rightPadding
 
     property int currentSpacing:
@@ -32,6 +35,41 @@ SwipeView {
         id: innerPage
         background: null
 
+        header: HRectangle {
+            width: parent.width
+            implicitWidth: parent.width
+            color: theme.pageHeadersBackground
+
+            height: ! hideHeaderUnderHeight ||
+                    window.height >=
+                    hideHeaderUnderHeight +
+                    theme.baseElementsHeight +
+                    currentSpacing * 2 ?
+                    theme.baseElementsHeight : 0
+
+            Behavior on height { HNumberAnimation {} }
+            visible: height > 0
+
+            HRowLayout {
+                width: parent.width
+
+                HLabel {
+                    id: innerHeaderLabel
+                    text: qsTr("Account settings for %1").arg(
+                        Utils.coloredNameHtml(userInfo.displayName, userId)
+                    )
+                    textFormat: Text.StyledText
+                    font.pixelSize: theme.fontSize.big
+                    elide: Text.ElideRight
+                    horizontalAlignment: Text.AlignHCenter
+
+                    Layout.leftMargin: currentSpacing
+                    Layout.rightMargin: Layout.leftMargin
+                    Layout.fillWidth: true
+                }
+            }
+        }
+
         leftPadding: currentSpacing < theme.spacing ? 0 : currentSpacing
         rightPadding: leftPadding
         Behavior on leftPadding { HNumberAnimation {} }
diff --git a/src/qml/Pages/EditAccount/EditAccount.qml b/src/qml/Pages/EditAccount/EditAccount.qml
index 9989ae92..74a1a39e 100644
--- a/src/qml/Pages/EditAccount/EditAccount.qml
+++ b/src/qml/Pages/EditAccount/EditAccount.qml
@@ -15,37 +15,9 @@ HPage {
     property string userId: ""
     readonly property var userInfo: users.find(userId)
 
-    page.header: HRectangle {
-        width: parent.width
-        color: theme.pageHeadersBackground
-
-        height: window.height <
-                avatarPreferredSize +
-                theme.baseElementsHeight +
-                currentSpacing * 2 ?
-                0 : theme.baseElementsHeight
-
-        Behavior on height { HNumberAnimation {} }
-        visible: height > 0
-
-        HRowLayout {
-            width: parent.width
-
-            HLabel {
-                text: qsTr("Account settings for %1").arg(
-                    Utils.coloredNameHtml(userInfo.displayName, userId)
-                )
-                textFormat: Text.StyledText
-                font.pixelSize: theme.fontSize.big
-                elide: Text.ElideRight
-                horizontalAlignment: Text.AlignHCenter
-
-                Layout.leftMargin: currentSpacing
-                Layout.rightMargin: Layout.leftMargin
-                Layout.fillWidth: true
-            }
-        }
-    }
+    hideHeaderUnderHeight: avatarPreferredSize
+    headerLabel.text: qsTr("Account settings for %1")
+                      .arg(Utils.coloredNameHtml(userInfo.displayName, userId))
 
     HRectangle {
         color: theme.box.background
diff --git a/src/qml/UI.qml b/src/qml/UI.qml
index 85fbf8dc..7740b8c7 100644
--- a/src/qml/UI.qml
+++ b/src/qml/UI.qml
@@ -44,6 +44,7 @@ Item {
             Layout.minimumWidth: reduce ? 0 : theme.sidePane.collapsedWidth
 
             Behavior on Layout.minimumWidth {
+                // Must run faster than SidePane implicitWidth anim
                 HNumberAnimation { duration: theme.animationDuration / 2 }
             }
         }