summaryrefslogtreecommitdiffstats
path: root/mobile-widgets/qml/DiveList.qml
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-08-14 23:53:28 +0200
committerGravatar bstoeger <32835590+bstoeger@users.noreply.github.com>2019-09-14 13:20:59 +0200
commit1b9581369af95bdf366f08c0d00d24c315d339bb (patch)
treea7c38c8993f14acc8eac4d8ba8a6f8d49e0975d8 /mobile-widgets/qml/DiveList.qml
parentb7cddcc737886ee3e99cee30a78423570de15f00 (diff)
downloadsubsurface-1b9581369af95bdf366f08c0d00d24c315d339bb.tar.gz
Mobile: move tripId from DiveObjectHelper to DiveListModel
The canonical way of displaying lists in Qt is via models. Thus, return the tripId directly from the DiveListModel instead of going indirectly via a DiveObjectHelper. In the future, this will allow us to make the DiveObjectHelper value-based, as it is not generated numerous times for every list item. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets/qml/DiveList.qml')
-rw-r--r--mobile-widgets/qml/DiveList.qml8
1 files changed, 4 insertions, 4 deletions
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml
index 23537ac79..6be6d6d8f 100644
--- a/mobile-widgets/qml/DiveList.qml
+++ b/mobile-widgets/qml/DiveList.qml
@@ -57,7 +57,7 @@ Kirigami.ScrollablePage {
states: [
State {
name: "isHidden";
- when: dive.tripId !== activeTrip && ! diveOutsideTrip
+ when: tripId !== activeTrip && ! diveOutsideTrip
PropertyChanges {
target: innerListItem
height: 0
@@ -66,7 +66,7 @@ Kirigami.ScrollablePage {
},
State {
name: "isVisible";
- when: dive.tripId === activeTrip || diveOutsideTrip
+ when: tripId === activeTrip || diveOutsideTrip
PropertyChanges {
target: innerListItem
height: diveListEntry.height + Kirigami.Units.smallSpacing
@@ -129,7 +129,7 @@ Kirigami.ScrollablePage {
Item {
Rectangle {
id: leftBarDive
- width: dive.tripId == "" ? 0 : Kirigami.Units.smallSpacing
+ width: tripId == "" ? 0 : Kirigami.Units.smallSpacing
height: diveListEntry.height * 0.8
color: subsurfaceTheme.lightPrimaryColor
anchors {
@@ -524,7 +524,7 @@ Kirigami.ScrollablePage {
maximumFlickVelocity: parent.height * 5
bottomMargin: Kirigami.Units.iconSizes.medium + Kirigami.Units.gridUnit
cacheBuffer: 40 // this will increase memory use, but should help with scrolling
- section.property: "dive.tripId"
+ section.property: "tripId"
section.criteria: ViewSection.FullString
section.delegate: tripHeading
section.labelPositioning: ViewSection.CurrentLabelAtStart | ViewSection.InlineLabels