Small fixes for sailfish os

[quandoparte] / application / resources / sailfish / qml / pages / StationPage.qml

diff --git a/application/resources/sailfish/qml/pages/StationPage.qml b/application/resources/sailfish/qml/pages/StationPage.qml
index 555582a..9d240d9 100644 (file)
--- a/application/resources/sailfish/qml/pages/StationPage.qml
+++ b/application/resources/sailfish/qml/pages/StationPage.qml
@@ -1,69 +1,40 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
 import net.cirulla.quandoparte 1.0
+import "components"
 
 Page {
     property alias name: schedule.name
     property alias code: schedule.code
 
-    tools: ToolBarLayout {
-        id: toolBar
-        ToolIcon {
-            iconId: "icon-m-toolbar-back" + (theme.inverted ? "-white": "")
-            onClicked: pageStack.pop()
-        }
-        ToolIcon {
-            iconId: "icon-m-toolbar-refresh" + (theme.inverted ? "-white": "")
-            onClicked: updateStation() }
-        ToolIcon {
-            iconId: "icon-m-toolbar-view-menu" + (theme.inverted ? "-white": "")
-            onClicked: menu.open()
-        }
-    }
-    PageHeader {
-        id: header
-        anchors.top: parent.top
-        selectedIndex: schedule.type
-        options: [
-            qsTr("Departures"),
-            qsTr("Arrivals")
-        ]
-    }
-    InfoBar {
-        id: infoBar
-        anchors.top: header.bottom
-        text: parent.name
-    }
-    Binding {
-        target: schedule
-        property: "type"
-        value: header.selectedIndex
-    }
-    LabelStyle {
-        id: labelStyle
-    }
-    Item {
+    SilicaFlickable {
         id: view
-        anchors {
-            top: infoBar.bottom
-            bottom: parent.bottom
-            left: parent.left
-            right: parent.right
-        }
-        DroppedShadow {
-            id: shadow
-            anchors.top: view.top
+        anchors.fill: parent
+        PullDownMenu {
+            MenuItem {
+                text: qsTr("Update Schedule")
+                onClicked: updateStation()
+            }
+            MenuItem {
+                text: qsTr("Departures")
+                onClicked: schedule.type = StationScheduleModel.DepartureSchedule
+            }
+            MenuItem {
+                text: qsTr("Arrivals")
+                onClicked: schedule.type = StationScheduleModel.ArrivalSchedule
+            }
         }
-        ListView {
+        SilicaListView {
             id: stationScheduleView
+            anchors.fill: parent
             clip: true
             visible: false
             width: parent.width
             cacheBuffer: 40
-            anchors {
-                top: shadow.top
-                bottom: parent.bottom
-            }
+            header: PageHeader {
+                    id: header
+                    title: (schedule.type === StationScheduleModel.DepartureSchedule ? qsTr("Departures from ") : qsTr("Arrivals to ")) + name
+                }
             model: schedule
             delegate: StationScheduleDelegate {
                 width: stationScheduleView.width
@@ -78,36 +49,24 @@ Page {
                 expectedPlatfrom: model.expectedPlatform
             }
         }
-        ScrollDecorator {
-            id: decorator
-            flickableItem: stationScheduleView
-        }
         BusyIndicator {
             id: busyIndicator
-            platformStyle: BusyIndicatorStyle {
-                size: "large"
-            }
             anchors.centerIn: parent
             running: visible
+            size: BusyIndicatorSize.Large
         }
         Item {
             id: errorDisplay
-            anchors.centerIn: parent
+            anchors.fill: parent
             Column {
-                anchors.centerIn: parent
-                spacing: UiConstants.DefaultMargin
-                Text {
-                    text: qsTr("Error!")
+                anchors.fill: parent
+                spacing: Theme.paddingLarge
+                Label {
+                    textFormat: Text.StyledText
+                    wrapMode: Text.WordWrap
+                    text: "<p>" + qsTr("Error!") + "</p><p>" + schedule.error + "</p>"
                     width: parent.width
-                    font.pixelSize: UiConstants.HeaderFontPixelSize
-                    font.bold: UiConstants.HeaderFontBoldness
-                    horizontalAlignment: Text.AlignHCenter
-                }
-                Text {
-                    text: schedule.error
-                    width: parent.width
-                    font.pixelSize: UiConstants.HeaderFontPixelSize
-                    font.bold: UiConstants.DefaultFontBoldness
+                    font.pixelSize: Theme.fontSizeHuge
                     horizontalAlignment: Text.AlignHCenter
                 }
             }
@@ -161,20 +120,22 @@ Page {
                 }
             }
         ]
-    }
-    StationScheduleModel {
-        id: schedule
-        onNameChanged: updateStation()
-        onLayoutChanged: if (error) view.state = "error"
-                         else view.state = "ready"
-    }
-    Component.onCompleted: {
-        updateTimer.timeout.connect(updateStation)
-        view.state = "loading"
-    }
-    function updateStation() {
-        view.state = "loading"
-        console.log("Updating station with " + schedule.name + ", " + schedule.code)
-        schedule.fetch(schedule.name, schedule.code)
+
+        function updateStation() {
+            view.state = "loading"
+            console.log("Updating station with " + schedule.name + ", " + schedule.code)
+            schedule.fetch(schedule.name, schedule.code)
+        }
+        StationScheduleModel {
+            id: schedule
+            onNameChanged: view.updateStation()
+            onLayoutChanged: if (error) view.state = "error"
+                             else view.state = "ready"
+        }
+
+        Component.onCompleted: {
+            updateTimer.triggered.connect(view.updateStation)
+            view.state = "loading"
+        }
     }
 }