From a3f0f13ff3b937f59e8829f4f7283ec7ca478c6f Mon Sep 17 00:00:00 2001
From: dorian <dorian@itsblue.de>
Date: Fri, 31 May 2019 19:06:04 +0200
Subject: [PATCH] finished up the layout of the profile and results view

---
 graphics/icons/ok.png                 | Bin 0 -> 2131 bytes
 qml/ProfilesDialog.qml                |  72 +++++++++++++++++++-------
 qml/components/RemoteDataListView.qml |   7 +++
 shared.qrc                            |   1 +
 sources/apptheme.cpp                  |   6 ++-
 5 files changed, 64 insertions(+), 22 deletions(-)
 create mode 100644 graphics/icons/ok.png

diff --git a/graphics/icons/ok.png b/graphics/icons/ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..e24854f8d826993ff8ec75fe7deaf860f39f9d6e
GIT binary patch
literal 2131
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
JPDHLkV1j+k{iy%|

literal 0
HcmV?d00001

diff --git a/qml/ProfilesDialog.qml b/qml/ProfilesDialog.qml
index bcd6124..2cef0ea 100644
--- a/qml/ProfilesDialog.qml
+++ b/qml/ProfilesDialog.qml
@@ -18,7 +18,7 @@
 import QtQuick 2.9
 import QtMultimedia 5.8
 import QtQuick.Window 2.2
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 import com.itsblue.speedclimbingstopwatch 1.0
@@ -44,7 +44,6 @@ Popup {
     }
 
     background: Item {
-
         RectangularGlow {
             id: backgroundEffect
             glowRadius: 7
@@ -64,7 +63,6 @@ Popup {
         }
     }
 
-
     StackView {
         id: profiles_stack
         property int text_pixelSize: headlineUnderline.width * 0.08
@@ -75,9 +73,9 @@ Popup {
             top: topContainerItm.bottom
             left: parent.left
             leftMargin: ( parent.width - headlineUnderline.width ) / 2
-            //topMargin: headlineUnderline.anchors.topMargin * 1.2
+            topMargin: headlineUnderline.anchors.topMargin * 1.2
             bottom: parent.bottom
-            bottomMargin: topContainerItm.height
+            bottomMargin: topContainerItm.height * 0.3
         }
 
         Behavior on opacity {
@@ -88,7 +86,6 @@ Popup {
             profiles_stack.init()
         }
 
-
         Connections {
             target: root
             onOpened: {
@@ -136,8 +133,8 @@ Popup {
                         profileList.loadData()
                     }
 
-                    anchors.fill: parent
-                    anchors.topMargin: topContainerItm.height * 0.1
+                    //anchors.fill: parent
+                    //anchors.topMargin: topContainerItm.height * 0.1
 
                     loadData: function () {
                         status = 905
@@ -217,6 +214,7 @@ Popup {
                             anchors {
                                 verticalCenter: parent.verticalCenter
                                 right: parent.right
+                                rightMargin: 7
                             }
 
                             height: parent.height * 0.6
@@ -390,6 +388,9 @@ Popup {
 
                 signal opened()
 
+                anchors.margins: 10
+
+                clip: true
 
                 onOpened: {
                     loadData()
@@ -474,20 +475,28 @@ Popup {
         }
 
         /*-----Custom animations-----*/
+        property int animationDuration: 200
         pushEnter: Transition {
             NumberAnimation {
                 property: "opacity"
                 from: 0
                 to: 1
-                duration: 300
+                duration: profiles_stack.animationDuration
                 easing.type: Easing.InOutQuad
             }
 
-            NumberAnimation {
+            /*NumberAnimation {
                 property: "x"
                 from: width * 0.1
                 to: 0
                 duration: 300
+            }*/
+
+            NumberAnimation {
+                property: "scale"
+                from: 1.1
+                to: 1
+                duration: profiles_stack.animationDuration
             }
         }
         pushExit: Transition {
@@ -495,15 +504,22 @@ Popup {
                 property: "opacity"
                 from: 1
                 to: 0
-                duration: 300
+                duration: profiles_stack.animationDuration
                 easing.type: Easing.InOutQuad
             }
 
-            NumberAnimation {
+            /*NumberAnimation {
                 property: "x"
                 to: -width * 0.1
                 from: 0
                 duration: 300
+            }*/
+
+            NumberAnimation {
+                property: "scale"
+                from: 1
+                to: 0.9
+                duration: profiles_stack.animationDuration
             }
         }
 
@@ -512,14 +528,22 @@ Popup {
                 property: "opacity"
                 from: 1
                 to: 0
-                duration: 300
+                duration: profiles_stack.animationDuration
                 easing.type: Easing.InOutQuad
             }
-            NumberAnimation {
+
+            /*NumberAnimation {
                 property: "x"
                 to: width * 0.1
                 from: 0
                 duration: 300
+            }*/
+
+            NumberAnimation {
+                property: "scale"
+                from: 1
+                to: 1.1
+                duration: profiles_stack.animationDuration
             }
         }
         popEnter: Transition {
@@ -527,14 +551,22 @@ Popup {
                 property: "opacity"
                 from: 0
                 to: 1
-                duration: 300
+                duration: profiles_stack.animationDuration
                 easing.type: Easing.InOutQuad
             }
-            NumberAnimation {
+
+            /*NumberAnimation {
                 property: "x"
                 from: -width * 0.1
                 to: 0
                 duration: 300
+            }*/
+
+            NumberAnimation {
+                property: "scale"
+                from: 0.9
+                to: 1
+                duration: profiles_stack.animationDuration
             }
         }
     }
@@ -661,15 +693,15 @@ Popup {
         }
 
         height: topContainerItm.height * 0.8
-        width:height
+        width: height
 
-        opacity: root.opacity < 1 ? root.opacity : profiles_stack.currentItem.secondButt !== "none" ? 1:root.opacity
+        opacity: root.opacity < 1 ? root.opacity : ["ok", "add"].indexOf(profiles_stack.currentItem.secondButt) >= 0 ? 1:0
 
-        glowOpacity: root.opacity < 1 ? Math.pow( root.opacity, 100 ) : Math.pow( root.opacity, 100 )
+        glowOpacity: opacity < 1 ? Math.pow( opacity, 100 ) : Math.pow( opacity, 100 )
 
         backgroundColor: appTheme.style.buttonColor
 
-        image: "qrc:/graphics/icons/ok_black.png"
+        image: appTheme.style.confirmIcon
         imageScale: profiles_stack.currentItem.secondButt === "ok" ? 1:0
 
         Label {
diff --git a/qml/components/RemoteDataListView.qml b/qml/components/RemoteDataListView.qml
index e184bab..b750739 100644
--- a/qml/components/RemoteDataListView.qml
+++ b/qml/components/RemoteDataListView.qml
@@ -11,6 +11,9 @@ Item {
 
     property int status: -1
 
+    property alias contentY: listView.contentY
+    property alias model: listView.model
+
     signal refresh()
 
     Component.onCompleted: {
@@ -27,6 +30,10 @@ Item {
         boundsBehavior: Flickable.DragOverBounds
         boundsMovement: Flickable.StopAtBounds
 
+        anchors.margins: 1
+        anchors.rightMargin: 14
+        clip: true
+
         //enabled: status === 200 || status === 902
         //opacity: enabled ? 1:0
 
diff --git a/shared.qrc b/shared.qrc
index a5e6cc5..c430b9e 100644
--- a/shared.qrc
+++ b/shared.qrc
@@ -26,5 +26,6 @@
         <file>graphics/icons/buzzer.png</file>
         <file>graphics/icons/startpad.png</file>
         <file>graphics/icons/user_black.png</file>
+        <file>graphics/icons/ok.png</file>
     </qresource>
 </RCC>
diff --git a/sources/apptheme.cpp b/sources/apptheme.cpp
index 74e7ddd..799f9d4 100644
--- a/sources/apptheme.cpp
+++ b/sources/apptheme.cpp
@@ -35,7 +35,8 @@ AppTheme::AppTheme(QObject *parent) : QObject(parent)
         {"buzzerIcon", "qrc:/graphics/icons/buzzer.png"},
         {"startpadIcon", "qrc:/graphics/icons/startpad.png"},
         {"baseStationIcon", "qrc:/graphics/icons/BaseStation.png"},
-        {"profilesIcon", "qrc:/graphics/icons/user.png"}
+        {"profilesIcon", "qrc:/graphics/icons/user.png"},
+        {"confirmIcon", "qrc:/graphics/icons/ok.png"}
 
     };
     this->darkTheme = tmpDarkTheme;
@@ -72,7 +73,8 @@ AppTheme::AppTheme(QObject *parent) : QObject(parent)
         {"buzzerIcon", "qrc:/graphics/icons/buzzer_black.png"},
         {"startpadIcon", "qrc:/graphics/icons/startpad_black.png"},
         {"baseStationIcon", "qrc:/graphics/icons/BaseStation_black.png"},
-        {"profilesIcon", "qrc:/graphics/icons/user_black.png"}
+        {"profilesIcon", "qrc:/graphics/icons/user_black.png"},
+        {"confirmIcon", "qrc:/graphics/icons/ok_black.png"}
 
     };
     this->lightTheme = tmpLightTheme;