Display overall statistics

[harbour-pedalo.git] / qml / pages / JourneyInfo.qml

diff --git a/qml/pages/JourneyInfo.qml b/qml/pages/JourneyInfo.qml
index 6b0377d..02cea45 100644 (file)
--- a/qml/pages/JourneyInfo.qml
+++ b/qml/pages/JourneyInfo.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+import "../components"
 
 Page {
     id: journeyInfoPage
@@ -10,6 +11,14 @@ Page {
     property int overtakenby: -1
     property int index: -1
 
+    property real shortlineRatio: 0.6
+    property real shortlineMin: Theme.fontSizeSmall * 10
+    property real shortlineMax: width
+
+    property real widelineRatio: 0.6
+    property real widelineMin: Theme.fontSizeSmall * 10
+    property real widelineMax: width
+
     onDurationChanged: {
         var structured = new Date(0, 0, 0, 0, parseInt(duration / 60))
         durationTime.value = Qt.formatTime(structured, 'hh:mm')
@@ -30,36 +39,46 @@ Page {
     SilicaFlickable {
         id: journeyEditView
         anchors.fill: parent
-        contentHeight: journeyEditColumn.implicitHeight
+        contentHeight: journeyEditColumn.implicitHeight + headerItem.height
 
         VerticalScrollDecorator {}
 
+        PageHeader {
+            id: headerItem
+            title: journeyInfoPage.title
+        }
+
         Column {
             id: journeyEditColumn
-            spacing: Theme.paddingMedium
-            width: parent.width
-
-            PageHeader {
-                title: journeyInfoPage.title
-            }
+            spacing: Theme.paddingLarge
+            width: isPortrait ? parent.width : parent.width * 0.5
+            y: headerItem.height
 
-            ValueButton {
+            InfoRow {
                 id: startDate
                 label: "Date"
                 value: Qt.formatDate(start, 'd MMM yyyy')
                 width: parent.width
-                enabled: false
+                labelTextBold: true
+                midlineRatio: shortlineRatio
+                midlineMin: shortlineMin
+                midlineMax: shortlineMax
+                horizontalAlignment: Text.AlignRight
             }
 
-            ValueButton {
+            InfoRow {
                 id: startTime
                 label: qsTr("Start time")
                 value: Qt.formatTime(start, 'hh:mm')
                 width: parent.width
-                enabled: false
+                labelTextBold: true
+                midlineRatio: shortlineRatio
+                midlineMin: shortlineMin
+                midlineMax: shortlineMax
+                horizontalAlignment: Text.AlignRight
             }
 
-            ValueButton {
+            InfoRow {
                 id: endTime
                 property date time: new Date()
                 label: qsTr("End time")
@@ -69,38 +88,48 @@ Page {
                 onTimeChanged: {
                     value = Qt.formatTime(time, 'hh:mm')
                 }
+                labelTextBold: true
+                midlineRatio: shortlineRatio
+                midlineMin: shortlineMin
+                midlineMax: shortlineMax
+                horizontalAlignment: Text.AlignRight
             }
 
-            ValueButton {
+            InfoRow {
                 id: durationTime
                 label: qsTr("Duration")
                 value: Qt.formatTime(new Date(0, 0, 0, 0, parseInt(duration / 60)), 'hh:mm')
                 width: parent.width
                 enabled: false
+                labelTextBold: true
+                midlineRatio: shortlineRatio
+                midlineMin: shortlineMin
+                midlineMax: shortlineMax
+                horizontalAlignment: Text.AlignRight
             }
 
-            TextField {
+            InfoRow {
                 id: faster
                 width: parent.width
-                inputMethodHints: Qt.ImhDigitsOnly
                 label: qsTr("Cycles which you overtook")
-                placeholderText: label
-                text: overtook >= 0 ? "" + overtook : ""
-                horizontalAlignment: TextInput.AlignLeft
-                EnterKey.iconSource: "image://theme/icon-m-enter-next"
-                enabled: false
+                value: "" + overtook
+                labelTextBold: true
+                midlineRatio: widelineRatio
+                midlineMin: widelineMin
+                midlineMax: widelineMax
+                horizontalAlignment: Text.AlignRight
             }
 
-            TextField {
+            InfoRow {
                 id: slower
                 width: parent.width
-                inputMethodHints: Qt.ImhDigitsOnly
                 label: qsTr("Cycles which overtook you")
-                placeholderText: label
-                text: overtakenby >= 0 ? "" + overtakenby : ""
-                horizontalAlignment: TextInput.AlignLeft
-                EnterKey.iconSource: "image://theme/icon-m-enter-next"
-                enabled: false
+                value: "" + overtakenby
+                labelTextBold: true
+                midlineRatio: widelineRatio
+                midlineMin: widelineMin
+                midlineMax: widelineMax
+                horizontalAlignment: Text.AlignRight
             }
         }
     }