1
=== modified file 'src/qml/Messages.qml'
2
--- src/qml/Messages.qml	2015-04-13 13:11:46 +0000
3
+++ src/qml/Messages.qml	2015-05-11 17:56:31 +0000
4
@@ -185,7 +185,12 @@
5
185
        if (multipleAccounts && !telepathyHelper.defaultMessagingAccount && !settings.messagesDontAsk) {
185
        if (multipleAccounts && !telepathyHelper.defaultMessagingAccount && !settings.messagesDontAsk) {
6
186
            Qt.inputMethod.hide()
186
            Qt.inputMethod.hide()
7
187
            PopupUtils.open(Qt.createComponent("Dialogs/SetDefaultSIMCardDialog.qml").createObject(messages))
187
            PopupUtils.open(Qt.createComponent("Dialogs/SetDefaultSIMCardDialog.qml").createObject(messages))
8
188
        } else {
9
189
            // FIXME: We only show the swipe tutorial after select the default sim card to avoid problems with the dialog
10
190
            // Since the dialog will be removed soon we do not expend time refactoring the code to make it visible after the dialog
11
191
            swipeItemDemo.enable()
12
188
        }
192
        }
13
193
14
189
        return true
194
        return true
15
190
    }
195
    }
16
191
196
17
@@ -264,6 +269,12 @@
18
264
        addAttachmentsToModel(sharedAttachmentsTransfer)
269
        addAttachmentsToModel(sharedAttachmentsTransfer)
19
265
    }
270
    }
20
266
271
21
272
    onActiveChanged: {
22
273
        if (active && (eventModel.count > 0)){
23
274
            swipeItemDemo.enable()
24
275
        }
25
276
    }
26
277
27
267
    function updateFilters() {
278
    function updateFilters() {
28
268
        if (participants.length == 0) {
279
        if (participants.length == 0) {
29
269
            eventModel.filter = null
280
            eventModel.filter = null
30
@@ -1005,7 +1016,7 @@
31
1005
                for (var i = 0; i < attachments.count; i++) {
1016
                for (var i = 0; i < attachments.count; i++) {
32
1006
                    var attachment = []
1017
                    var attachment = []
33
1007
                    var item = attachments.get(i)
1018
                    var item = attachments.get(i)
35
1008
                    // we dont include smil files. they will be auto generated 
1019
                    // we dont include smil files. they will be auto generated
36
1009
                    if (item.contentType.toLowerCase() === "application/smil") {
1020
                    if (item.contentType.toLowerCase() === "application/smil") {
37
1010
                        continue
1021
                        continue
38
1011
                    }
1022
                    }
39
@@ -1033,4 +1044,19 @@
40
1033
    MessageInfoDialog {
1044
    MessageInfoDialog {
41
1034
        id: messageInfoDialog
1045
        id: messageInfoDialog
42
1035
    }
1046
    }
43
1047
44
1048
    SwipeItemDemo {
45
1049
        id: swipeItemDemo
46
1050
        objectName: "swipeItemDemo"
47
1051
48
1052
        property bool parentActive: messages.active
49
1053
50
1054
        parent: QuickUtils.rootItem(this)
51
1055
        anchors.fill: parent
52
1056
        onStatusChanged: {
53
1057
            if (status === Loader.Ready) {
54
1058
                Qt.inputMethod.hide()
55
1059
            }
56
1060
        }
57
1061
    }
58
1036
}
1062
}
59
1037
1063
60
=== added file 'src/qml/SwipeItemDemo.qml'
61
--- src/qml/SwipeItemDemo.qml	1970-01-01 00:00:00 +0000
62
+++ src/qml/SwipeItemDemo.qml	2015-05-11 17:56:31 +0000
63
@@ -0,0 +1,326 @@
64
1
/*
65
2
 * Copyright 2012-2015 Canonical Ltd.
66
3
 *
67
4
 * This file is part of dialer-app.
68
5
 *
69
6
 * dialer-app is free software; you can redistribute it and/or modify
70
7
 * it under the terms of the GNU General Public License as published by
71
8
 * the Free Software Foundation; version 3.
72
9
 *
73
10
 * dialer-app is distributed in the hope that it will be useful,
74
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
75
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
76
13
 * GNU General Public License for more details.
77
14
 *
78
15
 * You should have received a copy of the GNU General Public License
79
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
80
17
 */
81
18
82
19
import QtQuick 2.0
83
20
import QtQuick.Layouts 1.1
84
21
import Qt.labs.settings 1.0
85
22
86
23
import Ubuntu.Components 1.1
87
24
import Ubuntu.Contacts 0.1
88
25
89
26
90
27
Loader {
91
28
    id: root
92
29
93
30
    property bool necessary: true
94
31
    property bool enabled: false
95
32
96
33
97
34
    function enable() {
98
35
        root.enabled = true;
99
36
    }
100
37
101
38
    function disable() {
102
39
        if (root.enabled) {
103
40
            root.necessary = false;
104
41
            root.enabled = false;
105
42
        }
106
43
    }
107
44
108
45
    sourceComponent: necessary && enabled ? listItemDemoComponent : null
109
46
110
47
    Settings {
111
48
        property alias hintNecessary: root.necessary
112
49
    }
113
50
114
51
    Component {
115
52
        id: listItemDemoComponent
116
53
117
54
        Rectangle {
118
55
            id: rectangleContents
119
56
120
57
            color: "black"
121
58
            opacity: 0.0
122
59
            anchors.fill: parent
123
60
124
61
            Behavior on opacity {
125
62
                UbuntuNumberAnimation {
126
63
                    duration:  UbuntuAnimation.SlowDuration
127
64
                }
128
65
            }
129
66
130
67
            Button {
131
68
                id: gotItButton
132
69
                objectName: "gotItButton"
133
70
134
71
                anchors {
135
72
                    bottom: dragTitle.top
136
73
                    horizontalCenter: parent.horizontalCenter
137
74
                    bottomMargin: units.gu(19)
138
75
                }
139
76
                width: units.gu(17)
140
77
                strokeColor: UbuntuColors.green
141
78
                text: i18n.tr("Got it")
142
79
                enabled: !dismissAnimation.running
143
80
                onClicked: dismissAnimation.start()
144
81
145
82
                InverseMouseArea {
146
83
                    anchors.fill: parent
147
84
                    topmostItem: true
148
85
                }
149
86
            }
150
87
151
88
            RowLayout {
152
89
                id: dragTitle
153
90
154
91
                anchors {
155
92
                    left: parent.left
156
93
                    right: parent.right
157
94
                    bottom: listItem.top
158
95
                    margins: units.gu(1)
159
96
                }
160
97
                height: units.gu(3)
161
98
                spacing: units.gu(2)
162
99
163
100
                Image {
164
101
                    visible: listItem.swipeState === "RightToLeft"
165
102
                    source: Qt.resolvedUrl("./assets/swipe_arrow.svg")
166
103
                    rotation: 180
167
104
                    Layout.preferredWidth: sourceSize.width
168
105
                    height: parent.height
169
106
                    verticalAlignment: Image.AlignVCenter
170
107
                    fillMode: Image.Pad
171
108
                    sourceSize {
172
109
                        width: units.gu(7)
173
110
                        height: units.gu(2)
174
111
                    }
175
112
                }
176
113
177
114
                Label {
178
115
                    id: dragMessage
179
116
180
117
                    Layout.fillWidth: true
181
118
                    height: parent.height
182
119
                    verticalAlignment: Image.AlignVCenter
183
120
                    wrapMode: Text.Wrap
184
121
                    fontSize: "large"
185
122
                    color: "#ffffff"
186
123
                }
187
124
188
125
                Image {
189
126
                    visible: listItem.swipeState === "LeftToRight"
190
127
                    source: Qt.resolvedUrl("./assets/swipe_arrow.svg")
191
128
                    Layout.preferredWidth: sourceSize.width
192
129
                    height: parent.height
193
130
                    verticalAlignment: Image.AlignVCenter
194
131
                    fillMode: Image.Pad
195
132
                    sourceSize {
196
133
                        width: units.gu(7)
197
134
                        height: units.gu(2)
198
135
                    }
199
136
                }
200
137
            }
201
138
202
139
            MessageDelegateFactory {
203
140
                id: listItem
204
141
205
142
                property int xPos: 0
206
143
                // message data
207
144
                property int index: 10
208
145
                property int textMessageStatus: 1
209
146
                property var textMessageAttachments: []
210
147
                property var messageData: null
211
148
212
149
                incoming: true
213
150
                accountLabel: ""
214
151
215
152
                anchors {
216
153
                    bottom: parent.bottom
217
154
                    bottomMargin: units.gu(8)
218
155
                    left: parent.left
219
156
                    right: parent.right
220
157
                }
221
158
222
159
                Component.onCompleted: {
223
160
                    messageData = {
224
161
                    "textMessage": i18n.tr("Welcome to your Ubuntu messaging app."),
225
162
                    "timestamp": new Date(),
226
163
                    "textMessageStatus": 1,
227
164
                    "senderId": "self",
228
165
                    "textReadTimestamp": new Date(),
229
166
                    "textMessageAttachments": [],
230
167
                    "newEvent": false,
231
168
                    "accountId": "",
232
169
                    "accountLabel" : ""}
233
170
                }
234
171
235
172
                rightSideActions: [
236
173
                    Action {
237
174
                        id: infoAction
238
175
239
176
                        iconName: "info"
240
177
                        text: i18n.tr("Info")
241
178
                    },
242
179
                    Action {
243
180
                        iconName: "reload"
244
181
                        text: i18n.tr("Retry")
245
182
                    },
246
183
                    Action {
247
184
                        iconName: "edit-copy"
248
185
                        text: i18n.tr("Copy")
249
186
                    }
250
187
                ]
251
188
252
189
                animated: false
253
190
                onXPosChanged: listItem.updatePosition(xPos)
254
191
255
192
            }
256
193
257
194
            SequentialAnimation {
258
195
                id: slideAnimation
259
196
260
197
                readonly property real leftToRightXpos: (-3 * (listItem.actionWidth + units.gu(2)))
261
198
                readonly property real rightToLeftXpos: listItem.leftActionWidth
262
199
263
200
                loops: Animation.Infinite
264
201
                running: root.enabled
265
202
266
203
                PropertyAction {
267
204
                    target: dragMessage
268
205
                    property: "text"
269
206
                    value: i18n.tr("Swipe to reveal actions")
270
207
                }
271
208
272
209
                PropertyAction {
273
210
                    target: dragMessage
274
211
                    property: "horizontalAlignment"
275
212
                    value: Text.AlignLeft
276
213
                }
277
214
278
215
                ParallelAnimation {
279
216
                    PropertyAnimation {
280
217
                        target:  listItem
281
218
                        property: "xPos"
282
219
                        from: 0
283
220
                        to: slideAnimation.leftToRightXpos
284
221
                        duration: 2000
285
222
                    }
286
223
                    PropertyAnimation {
287
224
                        target: dragTitle
288
225
                        property: "opacity"
289
226
                        from: 0
290
227
                        to: 1
291
228
                        duration: UbuntuAnimation.SleepyDuration
292
229
                    }
293
230
                }
294
231
295
232
                PauseAnimation {
296
233
                    duration: UbuntuAnimation.SleepyDuration
297
234
                }
298
235
299
236
                ParallelAnimation {
300
237
                    PropertyAnimation {
301
238
                        target: dragTitle
302
239
                        property: "opacity"
303
240
                        to: 0
304
241
                        duration: UbuntuAnimation.SlowDuration
305
242
                    }
306
243
307
244
                    PropertyAnimation {
308
245
                        target: listItem
309
246
                        property: "xPos"
310
247
                        from: slideAnimation.leftToRightXpos
311
248
                        to: 0
312
249
                        duration: UbuntuAnimation.SleepyDuration
313
250
                    }
314
251
                }
315
252
316
253
                PropertyAction {
317
254
                    target: dragMessage
318
255
                    property: "text"
319
256
                    value: i18n.tr("Swipe to delete")
320
257
                }
321
258
322
259
                PropertyAction {
323
260
                    target: dragMessage
324
261
                    property: "horizontalAlignment"
325
262
                    value: Text.AlignRight
326
263
                }
327
264
328
265
                ParallelAnimation {
329
266
                    PropertyAnimation {
330
267
                        target: listItem
331
268
                        property: "xPos"
332
269
                        from: 0
333
270
                        to: slideAnimation.rightToLeftXpos
334
271
                        duration: UbuntuAnimation.SleepyDuration
335
272
                    }
336
273
                    PropertyAnimation {
337
274
                        target: dragTitle
338
275
                        property: "opacity"
339
276
                        from: 0
340
277
                        to: 1
341
278
                        duration: UbuntuAnimation.SlowDuration
342
279
                    }
343
280
                }
344
281
345
282
                PauseAnimation {
346
283
                    duration: UbuntuAnimation.SleepyDuration
347
284
                }
348
285
349
286
                ParallelAnimation {
350
287
                    PropertyAnimation {
351
288
                        target: dragTitle
352
289
                        property: "opacity"
353
290
                        to: 0
354
291
                        duration: UbuntuAnimation.SlowDuration
355
292
                    }
356
293
357
294
                    PropertyAnimation {
358
295
                        target: listItem
359
296
                        property: "xPos"
360
297
                        from: slideAnimation.rightToLeftXpos
361
298
                        to: 0
362
299
                        duration: UbuntuAnimation.SleepyDuration
363
300
                    }
364
301
                }
365
302
            }
366
303
367
304
            SequentialAnimation {
368
305
                id: dismissAnimation
369
306
370
307
                alwaysRunToEnd: true
371
308
                running: false
372
309
373
310
                UbuntuNumberAnimation {
374
311
                    target: rectangleContents
375
312
                    property: "opacity"
376
313
                    to: 0.0
377
314
                    duration:  UbuntuAnimation.SlowDuration
378
315
                }
379
316
                ScriptAction {
380
317
                    script: root.disable()
381
318
                }
382
319
            }
383
320
384
321
            Component.onCompleted: {
385
322
                opacity = 0.85
386
323
            }
387
324
        }
388
325
    }
389
326
}
390
0
327
391
=== added file 'src/qml/assets/swipe_arrow.svg'
392
--- src/qml/assets/swipe_arrow.svg	1970-01-01 00:00:00 +0000
393
+++ src/qml/assets/swipe_arrow.svg	2015-05-11 17:56:31 +0000
394
@@ -0,0 +1,17 @@
395
1
<?xml version="1.0" encoding="utf-8"?>
396
2
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
397
3
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
398
4
	 viewBox="0 0 96.6 36.7" enable-background="new 0 0 96.6 36.7" xml:space="preserve">
399
5
<g>
400
6
	
401
7
		<path id="path2194-5_2_" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccc" inkscape:transform-center-x="-0.02188882" inkscape:transform-center-y="-31.980969" fill="#DC4B26" d="
402
8
		M96,18.7c-10.5-7.3-21.3-12-21.3-12l0,24"/>
403
9
	<circle id="circle4146" fill="#DC4B26" cx="69.2" cy="18.3" r="2.4"/>
404
10
	<circle id="circle4148" fill="#DC4B26" cx="58.5" cy="18.3" r="2.4"/>
405
11
	<circle id="circle4150" fill="#DC4B26" cx="47.8" cy="18.3" r="2.4"/>
406
12
	<circle id="circle4152" fill="#DC4B26" cx="37.1" cy="18.3" r="2.4"/>
407
13
	<circle id="circle4154" fill="#DC4B26" cx="26.4" cy="18.3" r="2.4"/>
408
14
	<circle id="circle4156" fill="#DC4B26" cx="15.7" cy="18.3" r="2.4"/>
409
15
</g>
410
16
<circle id="circle4156_1_" fill="#DC4B26" cx="4.9" cy="18.3" r="2.4"/>
411
17
</svg>
412
0
18
413
=== modified file 'tests/autopilot/messaging_app/emulators.py'
414
--- tests/autopilot/messaging_app/emulators.py	2015-02-17 16:02:59 +0000
415
+++ tests/autopilot/messaging_app/emulators.py	2015-05-11 17:56:31 +0000
416
@@ -386,6 +386,10 @@
417
386
386
418
387
        return thread_bubble
387
        return thread_bubble
419
388
388
420
389
    def get_swipe_item_demo(self):
421
390
        return self.wait_select_single(
422
391
            'SwipeItemDemo', objectName='swipeItemDemo', parentActive=True)
423
392
424
389
393
425
390
class PageWithBottomEdge(MainView):
394
class PageWithBottomEdge(MainView):
426
391
    """An emulator class that makes it easy to interact with the bottom edge
395
    """An emulator class that makes it easy to interact with the bottom edge
427
392
396
428
=== modified file 'tests/autopilot/messaging_app/fixture_setup.py'
429
--- tests/autopilot/messaging_app/fixture_setup.py	2015-02-18 12:05:36 +0000
430
+++ tests/autopilot/messaging_app/fixture_setup.py	2015-05-11 17:56:31 +0000
431
@@ -11,14 +11,17 @@
432
11
import os
11
import os
433
12
import subprocess
12
import subprocess
434
13
import shutil
13
import shutil
435
14
import tempfile
436
14
15
437
15
import fixtures
16
import fixtures
438
17
from ubuntuuitoolkit import fixture_setup
439
16
18
440
17
19
441
18
class MessagingTestEnvironment(fixtures.Fixture):
20
class MessagingTestEnvironment(fixtures.Fixture):
442
19
21
444
20
    def __init__(self, use_testdata_db=False):
22
    def __init__(self, use_testdata_db=False, use_empty_config=False):
445
21
        self.use_testdata_db = use_testdata_db
23
        self.use_testdata_db = use_testdata_db
446
24
        self.use_empty_config = use_empty_config
447
22
25
448
23
    def setUp(self):
26
    def setUp(self):
449
24
        super(MessagingTestEnvironment, self).setUp()
27
        super(MessagingTestEnvironment, self).setUp()
450
@@ -27,6 +30,11 @@
451
27
            self.useFixture(FillCustomSmsHistory())
30
            self.useFixture(FillCustomSmsHistory())
452
28
        else:
31
        else:
453
29
            self.useFixture(UseEmptySmsHistory())
32
            self.useFixture(UseEmptySmsHistory())
454
33
        # check for the configuration file
455
34
        if self.use_empty_config:
456
35
            self.useFixture(UseEmptyConfiguration())
457
36
        else:
458
37
            self.useFixture(UseDefaultConfiguration())
459
30
        self.useFixture(RespawnService())
38
        self.useFixture(RespawnService())
460
31
39
461
32
40
462
@@ -84,6 +92,38 @@
463
84
        self.database_path = ''
92
        self.database_path = ''
464
85
93
465
86
94
466
95
class UseEmptyConfiguration(fixtures.Fixture):
467
96
468
97
    def setUp(self):
469
98
        super(UseEmptyConfiguration, self).setUp()
470
99
        self.user_config_dir = tempfile.mkdtemp(
471
100
            suffix='', prefix='messaging-app')
472
101
        self.app_config_dir = (
473
102
            self.user_config_dir + '/com.ubuntu.messaging-app/')
474
103
        os.makedirs(self.app_config_dir)
475
104
        self.useFixture(
476
105
            fixtures.EnvironmentVariable(
477
106
                'XDG_CONFIG_HOME', newvalue=self.user_config_dir)
478
107
        )
479
108
        self.useFixture(
480
109
            fixture_setup.InitctlEnvironmentVariable(
481
110
                XDG_CONFIG_HOME=self.user_config_dir)
482
111
        )
483
112
484
113
    def tearDown(self):
485
114
        super(UseEmptyConfiguration, self).tearDown()
486
115
        shutil.rmtree(self.user_config_dir)
487
116
488
117
489
118
class UseDefaultConfiguration(UseEmptyConfiguration):
490
119
491
120
    def setUp(self):
492
121
        super(UseDefaultConfiguration, self).setUp()
493
122
        config_file_path = (self.app_config_dir + '/MessagingApp.conf')
494
123
        with open(config_file_path, 'w') as config_file:
495
124
            config_file.write('[General]\nhintNecessary=false\n')
496
125
497
126
498
87
class RespawnService(fixtures.Fixture):
127
class RespawnService(fixtures.Fixture):
499
88
128
500
89
    def setUp(self):
129
    def setUp(self):
501
90
130
502
=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
503
--- tests/autopilot/messaging_app/tests/test_messaging.py	2015-02-18 12:21:08 +0000
504
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2015-05-11 17:56:31 +0000
505
@@ -422,3 +422,57 @@
506
422
        self.messages_view = self.main_view.select_single(
422
        self.messages_view = self.main_view.select_single(
507
423
            emulators.Messages,
423
            emulators.Messages,
508
424
            text='text message')
424
            text='text message')
509
425
510
426
511
427
class MessagingTestSwipeToDeleteDemo(MessagingAppTestCase):
512
428
513
429
    def setUp(self):
514
430
        test_setup = fixture_setup.MessagingTestEnvironment(
515
431
            use_empty_config=True)
516
432
        self.useFixture(test_setup)
517
433
518
434
        super(MessagingTestSwipeToDeleteDemo, self).setUp()
519
435
520
436
    def test_write_new_message_with_tutorial(self):
521
437
        """Verify if the tutorial appears after send a message"""
522
438
        phone_num = '123'
523
439
        message = 'hello from Ubuntu'
524
440
        self.main_view.send_message(phone_num, message)
525
441
        self.main_view.close_osk()
526
442
527
443
        swipe_item_demo = self.main_view.get_swipe_item_demo()
528
444
        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(True)))
529
445
        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(True)))
530
446
        got_it_button = swipe_item_demo.select_single(
531
447
            'Button',
532
448
            objectName='gotItButton')
533
449
        self.pointing_device.click_object(got_it_button)
534
450
        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(False)))
535
451
        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(False)))
536
452
537
453
    def test_receive_new_message_with_tutorial(self):
538
454
        """Verify if the tutorial appears after receive a message"""
539
455
        thread_list = self.app.select_single(objectName='threadList')
540
456
        self.assertThat(thread_list.visible, Equals(True))
541
457
        self.assertThat(thread_list.count, Equals(0))
542
458
543
459
        number = '5555555678'
544
460
        message = 'open me'
545
461
        # receive message
546
462
        helpers.receive_sms(number, message)
547
463
        # verify that we got the message
548
464
        self.assertThat(thread_list.count, Eventually(Equals(1)))
549
465
550
466
        # click message thread
551
467
        mess_thread = thread_list.wait_select_single('Label', text=number)
552
468
        self.pointing_device.click_object(mess_thread)
553
469
554
470
        swipe_item_demo = self.main_view.get_swipe_item_demo()
555
471
        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(True)))
556
472
        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(True)))
557
473
        got_it_button = swipe_item_demo.select_single(
558
474
            'Button',
559
475
            objectName='gotItButton')
560
476
        self.pointing_device.click_object(got_it_button)
561
477
        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(False)))
562
478
        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(False)))
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)			Approve on 2015-05-07
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-05-07
Tiago Salem Herrmann (community)		2015-04-28	Needs Fixing on 2015-04-29
Review via email: mp+257706@code.launchpad.net