messaging-app

Merge lp:~renatofilho/messaging-app/swipe-item-demo into lp:messaging-app

swipe-item-demo
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2015-04-28

Status:

Merged

Approved by:

Gustavo Pichorim Boiko on 2015-05-07

Approved revision:

366

Merged at revision:

355

Proposed branch:

lp:~renatofilho/messaging-app/swipe-item-demo

Merge into:

lp:messaging-app

Diff against target:

562 lines (+469/-2)

6 files modified

src/qml/Messages.qml (+27/-1)
src/qml/SwipeItemDemo.qml (+326/-0)
src/qml/assets/swipe_arrow.svg (+17/-0)
tests/autopilot/messaging_app/emulators.py (+4/-0)
tests/autopilot/messaging_app/fixture_setup.py (+41/-1)
tests/autopilot/messaging_app/tests/test_messaging.py (+54/-0)

To merge this branch:

bzr merge lp:~renatofilho/messaging-app/swipe-item-demo

High

Fix Released

Link a bug report

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

Commit message

Show a swipe item demo during the first launch.

Description of the change

https://code.launchpad.net/~renatofilho/address-book-app/list-with-actions-animated/+merge/251086

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-29:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/549/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-04-29

355. By Renato Araujo Oliveira Filho on 2015-04-29: Update swipe item demo visuals.

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2015-04-29:

you added a png file but the code is trying to access an svg file.
also, not sure if the Ubuntu.Contacts include is needed.

review: Needs Fixing

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-04-29

356. By Renato Araujo Oliveira Filho on 2015-04-29: Added missing svg file.
357. By Renato Araujo Oliveira Filho on 2015-04-29: Show swipe demo after send a message if necessary.
358. By Renato Araujo Oliveira Filho on 2015-04-29: Created autopilot tests.
359. By Renato Araujo Oliveira Filho on 2015-04-29: Fixed pep8.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-29:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/550/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-04-29

360. By Renato Araujo Oliveira Filho on 2015-04-29: Fixed flake8.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/553/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/555/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-05-01

361. By Renato Araujo Oliveira Filho on 2015-04-30: Fixed autopilot tests on device.
362. By Renato Araujo Oliveira Filho on 2015-05-01: Created animations for the tutorial appear and desapear

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-01:

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/563/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2604/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/867/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1036/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/563/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-05-01

363. By Renato Araujo Oliveira Filho on 2015-05-01: Added a fade out on texts during the animation.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-02:

FAILED: Continuous integration, rev:363
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/564/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2614/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/870/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2612/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1039/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/564/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-05-05

364. By Renato Araujo Oliveira Filho on 2015-05-05: Fixed flake8 warnings.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/565/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2015-05-06:

Are there any related MPs required for this MP to build/function as expected?
- lp:~renatofilho/address-book-app/list-with-actions-animated

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
YES

If you changed UI labels, did you update the pot file?
NO, Will be updated in a diff MR

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
NO PACKAGE CHANGED

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-05-07

365. By Renato Araujo Oliveira Filho on 2015-05-07: Fixed autopilot test.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/566/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-05-07

366. By Renato Araujo Oliveira Filho on 2015-05-07: Fixed fade-out animation.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/567/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2015-05-07:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to the changes.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

lp:~renatofilho/messaging-app/swipe-item-demo updated on 2015-05-11

367. By Renato Araujo Oliveira Filho on 2015-05-11: Does not show swipe demo if the default sim card is not selected.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Sam Short

Ubuntu Phablet Team

 === modified file 'src/qml/Messages.qml'
 --- src/qml/Messages.qml	2015-04-13 13:11:46 +0000
 +++ src/qml/Messages.qml	2015-05-11 17:56:31 +0000
@@ -185,7 +185,12 @@
          if (multipleAccounts && !telepathyHelper.defaultMessagingAccount && !settings.messagesDontAsk) {
              Qt.inputMethod.hide()
              PopupUtils.open(Qt.createComponent("Dialogs/SetDefaultSIMCardDialog.qml").createObject(messages))
++        } else {
++            // FIXME: We only show the swipe tutorial after select the default sim card to avoid problems with the dialog
++            // Since the dialog will be removed soon we do not expend time refactoring the code to make it visible after the dialog
++            swipeItemDemo.enable()
+         }
++
          return true
+     }
@@ -264,6 +269,12 @@
          addAttachmentsToModel(sharedAttachmentsTransfer)
+     }
++    onActiveChanged: {
++        if (active && (eventModel.count > 0)){
++            swipeItemDemo.enable()
++        }
++    }
++
      function updateFilters() {
          if (participants.length == 0) {
              eventModel.filter = null
@@ -1005,7 +1016,7 @@
                  for (var i = 0; i < attachments.count; i++) {
                      var attachment = []
                      var item = attachments.get(i)
--                    // we dont include smil files. they will be auto generated
++                    // we dont include smil files. they will be auto generated
                      if (item.contentType.toLowerCase() === "application/smil") {
                          continue
+                     }
@@ -1033,4 +1044,19 @@
      MessageInfoDialog {
          id: messageInfoDialog
+     }
++
++    SwipeItemDemo {
++        id: swipeItemDemo
++        objectName: "swipeItemDemo"
++
++        property bool parentActive: messages.active
++
++        parent: QuickUtils.rootItem(this)
++        anchors.fill: parent
++        onStatusChanged: {
++            if (status === Loader.Ready) {
++                Qt.inputMethod.hide()
++            }
++        }
++    }
+ }
 === added file 'src/qml/SwipeItemDemo.qml'
 --- src/qml/SwipeItemDemo.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/SwipeItemDemo.qml	2015-05-11 17:56:31 +0000
@@ -0,0 +1,326 @@
++/*
++ * Copyright 2012-2015 Canonical Ltd.
++ *
++ * This file is part of dialer-app.
++ *
++ * dialer-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * dialer-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtQuick.Layouts 1.1
++import Qt.labs.settings 1.0
++
++import Ubuntu.Components 1.1
++import Ubuntu.Contacts 0.1
++
++
++Loader {
++    id: root
++
++    property bool necessary: true
++    property bool enabled: false
++
++
++    function enable() {
++        root.enabled = true;
++    }
++
++    function disable() {
++        if (root.enabled) {
++            root.necessary = false;
++            root.enabled = false;
++        }
++    }
++
++    sourceComponent: necessary && enabled ? listItemDemoComponent : null
++
++    Settings {
++        property alias hintNecessary: root.necessary
++    }
++
++    Component {
++        id: listItemDemoComponent
++
++        Rectangle {
++            id: rectangleContents
++
++            color: "black"
++            opacity: 0.0
++            anchors.fill: parent
++
++            Behavior on opacity {
++                UbuntuNumberAnimation {
++                    duration:  UbuntuAnimation.SlowDuration
++                }
++            }
++
++            Button {
++                id: gotItButton
++                objectName: "gotItButton"
++
++                anchors {
++                    bottom: dragTitle.top
++                    horizontalCenter: parent.horizontalCenter
++                    bottomMargin: units.gu(19)
++                }
++                width: units.gu(17)
++                strokeColor: UbuntuColors.green
++                text: i18n.tr("Got it")
++                enabled: !dismissAnimation.running
++                onClicked: dismissAnimation.start()
++
++                InverseMouseArea {
++                    anchors.fill: parent
++                    topmostItem: true
++                }
++            }
++
++            RowLayout {
++                id: dragTitle
++
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                    bottom: listItem.top
++                    margins: units.gu(1)
++                }
++                height: units.gu(3)
++                spacing: units.gu(2)
++
++                Image {
++                    visible: listItem.swipeState === "RightToLeft"
++                    source: Qt.resolvedUrl("./assets/swipe_arrow.svg")
++                    rotation: 180
++                    Layout.preferredWidth: sourceSize.width
++                    height: parent.height
++                    verticalAlignment: Image.AlignVCenter
++                    fillMode: Image.Pad
++                    sourceSize {
++                        width: units.gu(7)
++                        height: units.gu(2)
++                    }
++                }
++
++                Label {
++                    id: dragMessage
++
++                    Layout.fillWidth: true
++                    height: parent.height
++                    verticalAlignment: Image.AlignVCenter
++                    wrapMode: Text.Wrap
++                    fontSize: "large"
++                    color: "#ffffff"
++                }
++
++                Image {
++                    visible: listItem.swipeState === "LeftToRight"
++                    source: Qt.resolvedUrl("./assets/swipe_arrow.svg")
++                    Layout.preferredWidth: sourceSize.width
++                    height: parent.height
++                    verticalAlignment: Image.AlignVCenter
++                    fillMode: Image.Pad
++                    sourceSize {
++                        width: units.gu(7)
++                        height: units.gu(2)
++                    }
++                }
++            }
++
++            MessageDelegateFactory {
++                id: listItem
++
++                property int xPos: 0
++                // message data
++                property int index: 10
++                property int textMessageStatus: 1
++                property var textMessageAttachments: []
++                property var messageData: null
++
++                incoming: true
++                accountLabel: ""
++
++                anchors {
++                    bottom: parent.bottom
++                    bottomMargin: units.gu(8)
++                    left: parent.left
++                    right: parent.right
++                }
++
++                Component.onCompleted: {
++                    messageData = {
++                    "textMessage": i18n.tr("Welcome to your Ubuntu messaging app."),
++                    "timestamp": new Date(),
++                    "textMessageStatus": 1,
++                    "senderId": "self",
++                    "textReadTimestamp": new Date(),
++                    "textMessageAttachments": [],
++                    "newEvent": false,
++                    "accountId": "",
++                    "accountLabel" : ""}
++                }
++
++                rightSideActions: [
++                    Action {
++                        id: infoAction
++
++                        iconName: "info"
++                        text: i18n.tr("Info")
++                    },
++                    Action {
++                        iconName: "reload"
++                        text: i18n.tr("Retry")
++                    },
++                    Action {
++                        iconName: "edit-copy"
++                        text: i18n.tr("Copy")
++                    }
++                ]
++
++                animated: false
++                onXPosChanged: listItem.updatePosition(xPos)
++
++            }
++
++            SequentialAnimation {
++                id: slideAnimation
++
++                readonly property real leftToRightXpos: (-3 * (listItem.actionWidth + units.gu(2)))
++                readonly property real rightToLeftXpos: listItem.leftActionWidth
++
++                loops: Animation.Infinite
++                running: root.enabled
++
++                PropertyAction {
++                    target: dragMessage
++                    property: "text"
++                    value: i18n.tr("Swipe to reveal actions")
++                }
++
++                PropertyAction {
++                    target: dragMessage
++                    property: "horizontalAlignment"
++                    value: Text.AlignLeft
++                }
++
++                ParallelAnimation {
++                    PropertyAnimation {
++                        target:  listItem
++                        property: "xPos"
++                        from: 0
++                        to: slideAnimation.leftToRightXpos
++                        duration: 2000
++                    }
++                    PropertyAnimation {
++                        target: dragTitle
++                        property: "opacity"
++                        from: 0
++                        to: 1
++                        duration: UbuntuAnimation.SleepyDuration
++                    }
++                }
++
++                PauseAnimation {
++                    duration: UbuntuAnimation.SleepyDuration
++                }
++
++                ParallelAnimation {
++                    PropertyAnimation {
++                        target: dragTitle
++                        property: "opacity"
++                        to: 0
++                        duration: UbuntuAnimation.SlowDuration
++                    }
++
++                    PropertyAnimation {
++                        target: listItem
++                        property: "xPos"
++                        from: slideAnimation.leftToRightXpos
++                        to: 0
++                        duration: UbuntuAnimation.SleepyDuration
++                    }
++                }
++
++                PropertyAction {
++                    target: dragMessage
++                    property: "text"
++                    value: i18n.tr("Swipe to delete")
++                }
++
++                PropertyAction {
++                    target: dragMessage
++                    property: "horizontalAlignment"
++                    value: Text.AlignRight
++                }
++
++                ParallelAnimation {
++                    PropertyAnimation {
++                        target: listItem
++                        property: "xPos"
++                        from: 0
++                        to: slideAnimation.rightToLeftXpos
++                        duration: UbuntuAnimation.SleepyDuration
++                    }
++                    PropertyAnimation {
++                        target: dragTitle
++                        property: "opacity"
++                        from: 0
++                        to: 1
++                        duration: UbuntuAnimation.SlowDuration
++                    }
++                }
++
++                PauseAnimation {
++                    duration: UbuntuAnimation.SleepyDuration
++                }
++
++                ParallelAnimation {
++                    PropertyAnimation {
++                        target: dragTitle
++                        property: "opacity"
++                        to: 0
++                        duration: UbuntuAnimation.SlowDuration
++                    }
++
++                    PropertyAnimation {
++                        target: listItem
++                        property: "xPos"
++                        from: slideAnimation.rightToLeftXpos
++                        to: 0
++                        duration: UbuntuAnimation.SleepyDuration
++                    }
++                }
++            }
++
++            SequentialAnimation {
++                id: dismissAnimation
++
++                alwaysRunToEnd: true
++                running: false
++
++                UbuntuNumberAnimation {
++                    target: rectangleContents
++                    property: "opacity"
++                    to: 0.0
++                    duration:  UbuntuAnimation.SlowDuration
++                }
++                ScriptAction {
++                    script: root.disable()
++                }
++            }
++
++            Component.onCompleted: {
++                opacity = 0.85
++            }
++        }
++    }
++}
 === added file 'src/qml/assets/swipe_arrow.svg'
 --- src/qml/assets/swipe_arrow.svg	1970-01-01 00:00:00 +0000
 +++ src/qml/assets/swipe_arrow.svg	2015-05-11 17:56:31 +0000
@@ -0,0 +1,17 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
++<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"
++	 viewBox="0 0 96.6 36.7" enable-background="new 0 0 96.6 36.7" xml:space="preserve">
++<g>
++
++		<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="
++		M96,18.7c-10.5-7.3-21.3-12-21.3-12l0,24"/>
++	<circle id="circle4146" fill="#DC4B26" cx="69.2" cy="18.3" r="2.4"/>
++	<circle id="circle4148" fill="#DC4B26" cx="58.5" cy="18.3" r="2.4"/>
++	<circle id="circle4150" fill="#DC4B26" cx="47.8" cy="18.3" r="2.4"/>
++	<circle id="circle4152" fill="#DC4B26" cx="37.1" cy="18.3" r="2.4"/>
++	<circle id="circle4154" fill="#DC4B26" cx="26.4" cy="18.3" r="2.4"/>
++	<circle id="circle4156" fill="#DC4B26" cx="15.7" cy="18.3" r="2.4"/>
++</g>
++<circle id="circle4156_1_" fill="#DC4B26" cx="4.9" cy="18.3" r="2.4"/>
++</svg>
 === modified file 'tests/autopilot/messaging_app/emulators.py'
 --- tests/autopilot/messaging_app/emulators.py	2015-02-17 16:02:59 +0000
 +++ tests/autopilot/messaging_app/emulators.py	2015-05-11 17:56:31 +0000
@@ -386,6 +386,10 @@
          return thread_bubble
++    def get_swipe_item_demo(self):
++        return self.wait_select_single(
++            'SwipeItemDemo', objectName='swipeItemDemo', parentActive=True)
++
  class PageWithBottomEdge(MainView):
      """An emulator class that makes it easy to interact with the bottom edge
 === modified file 'tests/autopilot/messaging_app/fixture_setup.py'
 --- tests/autopilot/messaging_app/fixture_setup.py	2015-02-18 12:05:36 +0000
 +++ tests/autopilot/messaging_app/fixture_setup.py	2015-05-11 17:56:31 +0000
@@ -11,14 +11,17 @@
  import os
  import subprocess
  import shutil
++import tempfile
  import fixtures
++from ubuntuuitoolkit import fixture_setup
  class MessagingTestEnvironment(fixtures.Fixture):
--    def __init__(self, use_testdata_db=False):
++    def __init__(self, use_testdata_db=False, use_empty_config=False):
          self.use_testdata_db = use_testdata_db
++        self.use_empty_config = use_empty_config
      def setUp(self):
          super(MessagingTestEnvironment, self).setUp()
@@ -27,6 +30,11 @@
              self.useFixture(FillCustomSmsHistory())
          else:
              self.useFixture(UseEmptySmsHistory())
++        # check for the configuration file
++        if self.use_empty_config:
++            self.useFixture(UseEmptyConfiguration())
++        else:
++            self.useFixture(UseDefaultConfiguration())
          self.useFixture(RespawnService())
@@ -84,6 +92,38 @@
          self.database_path = ''
++class UseEmptyConfiguration(fixtures.Fixture):
++
++    def setUp(self):
++        super(UseEmptyConfiguration, self).setUp()
++        self.user_config_dir = tempfile.mkdtemp(
++            suffix='', prefix='messaging-app')
++        self.app_config_dir = (
++            self.user_config_dir + '/com.ubuntu.messaging-app/')
++        os.makedirs(self.app_config_dir)
++        self.useFixture(
++            fixtures.EnvironmentVariable(
++                'XDG_CONFIG_HOME', newvalue=self.user_config_dir)
++        )
++        self.useFixture(
++            fixture_setup.InitctlEnvironmentVariable(
++                XDG_CONFIG_HOME=self.user_config_dir)
++        )
++
++    def tearDown(self):
++        super(UseEmptyConfiguration, self).tearDown()
++        shutil.rmtree(self.user_config_dir)
++
++
++class UseDefaultConfiguration(UseEmptyConfiguration):
++
++    def setUp(self):
++        super(UseDefaultConfiguration, self).setUp()
++        config_file_path = (self.app_config_dir + '/MessagingApp.conf')
++        with open(config_file_path, 'w') as config_file:
++            config_file.write('[General]\nhintNecessary=false\n')
++
++
  class RespawnService(fixtures.Fixture):
      def setUp(self):
 === modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
 --- tests/autopilot/messaging_app/tests/test_messaging.py	2015-02-18 12:21:08 +0000
 +++ tests/autopilot/messaging_app/tests/test_messaging.py	2015-05-11 17:56:31 +0000
@@ -422,3 +422,57 @@
          self.messages_view = self.main_view.select_single(
              emulators.Messages,
              text='text message')
++
++
++class MessagingTestSwipeToDeleteDemo(MessagingAppTestCase):
++
++    def setUp(self):
++        test_setup = fixture_setup.MessagingTestEnvironment(
++            use_empty_config=True)
++        self.useFixture(test_setup)
++
++        super(MessagingTestSwipeToDeleteDemo, self).setUp()
++
++    def test_write_new_message_with_tutorial(self):
++        """Verify if the tutorial appears after send a message"""
++        phone_num = '123'
++        message = 'hello from Ubuntu'
++        self.main_view.send_message(phone_num, message)
++        self.main_view.close_osk()
++
++        swipe_item_demo = self.main_view.get_swipe_item_demo()
++        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(True)))
++        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(True)))
++        got_it_button = swipe_item_demo.select_single(
++            'Button',
++            objectName='gotItButton')
++        self.pointing_device.click_object(got_it_button)
++        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(False)))
++        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(False)))
++
++    def test_receive_new_message_with_tutorial(self):
++        """Verify if the tutorial appears after receive a message"""
++        thread_list = self.app.select_single(objectName='threadList')
++        self.assertThat(thread_list.visible, Equals(True))
++        self.assertThat(thread_list.count, Equals(0))
++
++        number = '5555555678'
++        message = 'open me'
++        # receive message
++        helpers.receive_sms(number, message)
++        # verify that we got the message
++        self.assertThat(thread_list.count, Eventually(Equals(1)))
++
++        # click message thread
++        mess_thread = thread_list.wait_select_single('Label', text=number)
++        self.pointing_device.click_object(mess_thread)
++
++        swipe_item_demo = self.main_view.get_swipe_item_demo()
++        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(True)))
++        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(True)))
++        got_it_button = swipe_item_demo.select_single(
++            'Button',
++            objectName='gotItButton')
++        self.pointing_device.click_object(got_it_button)
++        self.assertThat(swipe_item_demo.enabled, Eventually(Equals(False)))
++        self.assertThat(swipe_item_demo.necessary, Eventually(Equals(False)))