From a9b692f0c30fecf950c52099d7c0f336f88c901f Mon Sep 17 00:00:00 2001
From: Jan Mulder <jlmulder@xs4all.nl>
Date: Thu, 19 Oct 2017 15:41:05 +0200
Subject: QML-UI: Download screen fixup

Again, mostly related to label change. First, the top button was "glued"
to the top of the screen, so added a little margin there. It
appeared that all the other items on the screen (progressbar,
2 button rows, and the downloaded dive list) where not moving down
due to the add of that little top margin. This was solved by
anchor-ing the items together. Finally, the text of a downloaded
dive was on the top of the delegate lines. Not sure where that came
from, but easily solved by centering it explicitly.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
---
 mobile-widgets/qml/DownloadFromDiveComputer.qml | 24 +++++++++++++++++++++---
 mobile-widgets/qml/DownloadedDiveDelegate.qml   |  2 ++
 2 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'mobile-widgets/qml')

diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index 6b04cfc1b..9d11167d9 100644
--- a/mobile-widgets/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
@@ -59,6 +59,11 @@ Kirigami.Page {
 		width: parent.width
 		Layout.fillWidth: true
 		GridLayout {
+			id: buttonGrid
+			anchors {
+				top: parent.top
+				topMargin: Kirigami.Units.smallSpacing * 4
+			}
 			columns: 2
 			Controls.Label { text: qsTr(" Vendor name: ") }
 			property var vendoridx: downloadThread.data().getDetectedVendorIndex()
@@ -163,6 +168,10 @@ Kirigami.Page {
 		}
 
 		Controls.ProgressBar {
+			anchors {
+				top: buttonGrid.bottom
+				topMargin: Kirigami.Units.smallSpacing * 4
+			}
 			id: progressBar
 			Layout.fillWidth: true
 			indeterminate: true
@@ -170,9 +179,13 @@ Kirigami.Page {
 		}
 
 		RowLayout {
-			anchors.left: parent.left
-			anchors.right: parent.right
-			anchors.margins: Kirigami.Units.smallSpacing
+			id: buttonBar
+			anchors {
+				left: parent.left
+				right: parent.right
+				top: progressBar.bottom
+				topMargin: Kirigami.Units.smallSpacing * 2
+			}
 			spacing: Kirigami.Units.smallSpacing
 			SsrfButton {
 				id: download
@@ -206,6 +219,11 @@ Kirigami.Page {
 		}
 
 		ListView {
+			id: dlList
+			anchors {
+				top: buttonBar.bottom
+				topMargin: Kirigami.Units.smallSpacing * 4
+			}
 			Layout.fillWidth: true
 			Layout.fillHeight: true
 
diff --git a/mobile-widgets/qml/DownloadedDiveDelegate.qml b/mobile-widgets/qml/DownloadedDiveDelegate.qml
index be9e2aaf5..b88561b17 100644
--- a/mobile-widgets/qml/DownloadedDiveDelegate.qml
+++ b/mobile-widgets/qml/DownloadedDiveDelegate.qml
@@ -48,12 +48,14 @@ Kirigami.AbstractListItem {
 		Controls.Label {
 			id: dateLabel
 			text: innerListItem.datetime
+			anchors.verticalCenter: parent.verticalCenter
 			width: Math.round(parent.width * 0.35)
 			font.pointSize: subsurfaceTheme.smallPointSize
 			color: textColor
 		}
 		Controls.Label {
 			text: innerListItem.depth + ' / ' + innerListItem.duration
+			anchors.verticalCenter: parent.verticalCenter
 			width: Math.round(parent.width * 0.35)
 			font.pointSize: subsurfaceTheme.smallPointSize
 			color: textColor
-- 
cgit v1.2.3-70-g09d2