1
=== modified file 'app/components/LoadingIndicator.qml'
2
--- app/components/LoadingIndicator.qml	2015-11-02 21:28:34 +0000
3
+++ app/components/LoadingIndicator.qml	2017-04-19 10:56:54 +0000
4
@@ -22,18 +22,12 @@
5
22
Rectangle {
22
Rectangle {
6
23
    id: indicator
23
    id: indicator
7
24
    objectName: "processingIndicator"
24
    objectName: "processingIndicator"
8
25
    anchors {
9
26
        left: parent.left
10
27
        right: parent.right
11
28
        bottom: parent.bottom
12
29
        bottomMargin: Qt.inputMethod.keyboardRectangle.height
13
30
    }
14
31
    height: units.dp(3)
25
    height: units.dp(3)
15
32
    color: "white"
26
    color: "white"
16
33
    opacity: 0
27
    opacity: 0
17
34
    visible: opacity > 0
28
    visible: opacity > 0
18
35
29
20
36
    readonly property bool processing: loading
30
    property bool processing: false
21
37
31
22
38
    Behavior on opacity {
32
    Behavior on opacity {
23
39
        UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
33
        UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
24
40
34
25
=== modified file 'app/ubuntu-weather-app.qml'
26
--- app/ubuntu-weather-app.qml	2016-10-08 08:44:17 +0000
27
+++ app/ubuntu-weather-app.qml	2017-04-19 10:56:54 +0000
28
@@ -128,6 +128,13 @@
29
128
    function fillPages(locations) {
128
    function fillPages(locations) {
30
129
        locationsList = []
129
        locationsList = []
31
130
        locationsList = locations;
130
        locationsList = locations;
32
131
33
132
        // Loading is complete
34
133
        // Either directly from cached entries being passed here
35
134
        //  - storage.getLocations(fillPages);
36
135
        // or after updateData has occurred
37
136
        //  - fillPages(messageObject.result) from responseDataHandler
38
137
        loading = false;
39
131
    }
138
    }
40
132
139
41
133
    /*
140
    /*
42
134
141
43
=== modified file 'app/ui/HomePage.qml'
44
--- app/ui/HomePage.qml	2017-04-12 15:48:27 +0000
45
+++ app/ui/HomePage.qml	2017-04-19 10:56:54 +0000
46
@@ -35,10 +35,19 @@
47
35
        height: parent.height
35
        height: parent.height
48
36
        preloadContent: true
36
        preloadContent: true
49
37
        hint {
37
        hint {
50
38
            // Force using mouse style bottom edge hint (works well in touch)
51
39
            status: BottomEdgeHint.Locked
52
38
            // Once pad.lv/1536669 is fixed, the status will be auto set to
40
            // Once pad.lv/1536669 is fixed, the status will be auto set to
53
39
            // locked when a mouse is detected, in that case we'll show text
41
            // locked when a mouse is detected, in that case we'll show text
54
40
            // otherwise we hide the text as this causes strange animations
42
            // otherwise we hide the text as this causes strange animations
55
41
            text: bottomEdge.hint.status == BottomEdgeHint.Locked ? i18n.tr("Locations") : ""
43
            text: bottomEdge.hint.status == BottomEdgeHint.Locked ? i18n.tr("Locations") : ""
56
44
57
45
            // Force using mouse style bottom edge hint (works well in touch)
58
46
            onStatusChanged: {
59
47
                if (status == BottomEdgeHint.Inactive) {
60
48
                    bottomEdge.hint.status = BottomEdgeHint.Locked;
61
49
                }
62
50
            }
63
42
        }
51
        }
64
43
52
65
44
        Component {
53
        Component {
66
@@ -183,6 +192,13 @@
67
183
192
68
184
    LoadingIndicator {
193
    LoadingIndicator {
69
185
        id: loadingIndicator
194
        id: loadingIndicator
70
195
        anchors {
71
196
            bottom: parent.bottom
72
197
            bottomMargin: Qt.inputMethod.keyboardRectangle.height + bottomEdge.hint.height
73
198
            left: parent.left
74
199
            right: parent.right
75
200
        }
76
201
        processing: loading
77
186
    }
202
    }
78
187
203
79
188
    Loader {
204
    Loader {
Reviewer	Review Type	Date Requested	Status
Michael Sheldon (community)			Approve on 2017-04-19
Jenkins Bot	continuous-integration		Approve on 2017-04-19
Ubuntu Weather Developers		2017-04-19	Pending
Review via email: mp+322758@code.launchpad.net