From 78d5325dda8eadee8004183314195f2d61ffeb53 Mon Sep 17 00:00:00 2001 From: Sebastian Kügler Date: Sun, 29 Nov 2015 23:39:14 +0100 Subject: Simplify dive list items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace the custom text items with the Components' label - Remove now unneeded properties The goal is to use less different font sizes, as to give the listview a calmer and more uniform look. Signed-off-by: Sebastian Kügler --- qt-mobile/qml/DiveList.qml | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) (limited to 'qt-mobile/qml/DiveList.qml') diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml index 75f4f809e..ed75c96f8 100644 --- a/qt-mobile/qml/DiveList.qml +++ b/qt-mobile/qml/DiveList.qml @@ -39,22 +39,15 @@ MobileComponents.Page { stackView.push(detailsWindow) } - //Layout of the page: (mini profile, dive no, date at the top - //And other details at the bottom. Item { - x: MobileComponents.Units.smallSpacing + x: -1 * MobileComponents.Units.smallSpacing width: parent.width - MobileComponents.Units.smallSpacing * 2 - height: childrenRect.height + MobileComponents.Units.smallSpacing * 2 - //spacing: MobileComponents.Units.smallSpacing / 2 - anchors.margins: MobileComponents.Units.smallSpacing + height: childrenRect.height - MobileComponents.Units.smallSpacing - Text { + MobileComponents.Label { id: locationText text: location - color: MobileComponents.Theme.textColor - //font.pointSize: Math.round(MobileComponents.Units.fontMetrics.pointSize * 1.2) // why this doesn't work is a mystery to me, so ... - scale: 1.2 // Let's see how this works, otherwise, we'll need the default point size somewhere - transformOrigin: Item.TopLeft + font.weight: Font.Light elide: Text.ElideRight maximumLineCount: 1 // needed for elide to work at all anchors { @@ -63,16 +56,14 @@ MobileComponents.Page { right: dateLabel.left } } - Text { + MobileComponents.Label { id: dateLabel text: date opacity: 0.6 - color: MobileComponents.Theme.textColor font.pointSize: subsurfaceTheme.smallPointSize anchors { right: parent.right top: parent.top - bottomMargin: MobileComponents.Units.smallSpacing / 2 } } Row { @@ -82,36 +73,34 @@ MobileComponents.Page { right: parent.right bottom: numberText.bottom } - Text { + MobileComponents.Label { text: 'Depth: ' opacity: 0.6 - color: MobileComponents.Theme.textColor + font.pointSize: subsurfaceTheme.smallPointSize } - Text { + MobileComponents.Label { text: depth width: Math.max(MobileComponents.Units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview - color: MobileComponents.Theme.textColor + font.pointSize: subsurfaceTheme.smallPointSize } - Text { + MobileComponents.Label { text: 'Duration: ' opacity: 0.6 - color: MobileComponents.Theme.textColor + font.pointSize: subsurfaceTheme.smallPointSize } - Text { + MobileComponents.Label { text: duration - color: MobileComponents.Theme.textColor + font.pointSize: subsurfaceTheme.smallPointSize } } - Text { + MobileComponents.Label { id: numberText text: "#" + diveNumber color: MobileComponents.Theme.textColor - scale: 1.2 - transformOrigin: Item.BottomRight - opacity: 0.4 + font.pointSize: subsurfaceTheme.smallPointSize + opacity: 0.6 anchors { right: parent.right - topMargin: MobileComponents.Units.smallSpacing top: locationText.bottom } } -- cgit v1.2.3-70-g09d2 From f4906abf59cce798830e81c0362fab224516dcf9 Mon Sep 17 00:00:00 2001 From: Sebastian Kügler Date: Mon, 30 Nov 2015 00:57:18 +0100 Subject: Fix left margin in dive list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specifying a negative margin means that we negate the margin that the ListItem so carefully figures out for us, don't do that. Signed-off-by: Sebastian Kügler --- qt-mobile/qml/DiveList.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'qt-mobile/qml/DiveList.qml') diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml index ed75c96f8..77e8802f0 100644 --- a/qt-mobile/qml/DiveList.qml +++ b/qt-mobile/qml/DiveList.qml @@ -40,7 +40,6 @@ MobileComponents.Page { } Item { - x: -1 * MobileComponents.Units.smallSpacing width: parent.width - MobileComponents.Units.smallSpacing * 2 height: childrenRect.height - MobileComponents.Units.smallSpacing -- cgit v1.2.3-70-g09d2