Merge lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/ubuntu-rssreader-app-new-header-temp into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Nicholas Skaggs]

Meet Shorts with new header!

--

This is a resubmit under a common branch so everyone can edit. The tests have been corrected by Carla.

Meet Shorts with new header!

--

This is a resubmit under a common branch so everyone can edit. The tests have been corrected by Carla.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:277
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ubuntu-rssreader-dev/ubuntu-rssreader-app/ubuntu-rssreader-app-new-header-temp/+merge/235046/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/264/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2038/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2038/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/43

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/264/rebuild

review: Needs Fixing (continuous-integration)

[Joey Chan (qqworini)]

looks great ! ( ´∀`)σ)Д`) (◕‿◕✿)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'ArticleViewItem.qml'
--- ArticleViewItem.qml	2014-09-02 06:34:00 +0000
+++ ArticleViewItem.qml	2014-09-17 20:27:28 +0000
@@ -69,9 +69,9 @@
         width: parent.width
         anchors {
             bottom: parent.bottom
-            bottomMargin: units.gu(2)
+            bottomMargin: units.gu(1)
             top: parent.top
-            topMargin: units.gu(2)
+            topMargin: units.gu(1)
         }
 
         snapMode: ListView.SnapOneItem
@@ -185,7 +185,7 @@
                 }
 
                 Label {
-//                    fontSize: "large"
+                    //                    fontSize: "large"
                     color: "grey"
                     text: model.author ? model.author : ""
                     anchors.horizontalCenter: parent.horizontalCenter
@@ -225,69 +225,112 @@
                     width: parent.width - units.gu(4)
                     wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                 }
-
-                Button {
-                    id: showMediaButton
-
-                    text: i18n.tr("Show media")
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    // Everyone can test my "Show media". I want it in v 1.0 too.
-                    visible: false // model.media_groups ? true : false
-
-                    onClicked: {
-                        visible = false
-
-                        var medias = JSON.parse(rssModel.get(index).media_groups)
-                        var len = medias.length
-
-                        for (var i = 0; i < len; i++) {
-                            var media = medias[i]
-
-                            for (var j = 0; j < media.contents.length; j++) {
-                                var cont = media.contents[j]
-
-                                if (cont.type === "image/jpeg" || cont.type === "image/png" ||
-                                        cont.type === "image/jpeg" || cont.type === "image/pjpeg" ||
-                                        cont.type === "image/svg+xml" || cont.medium === "image") {
-                                    var mediaImg = mediaGroupImageComponent.createObject(innerAreaColumn)
-
-                                    innerAreaColumn.mediaDownloadInProgress++
-                                    mediaImg.mediaLoadFinished.connect(innerAreaColumn.mediaDownloaded)
-
-                                    mediaImg.anchors.horizontalCenter = showMediaButton.horizontalCenter
-                                    mediaImg.source = cont.url
-                                }
-                            }
-                        }
-                    }
-                }
-
-                ActivityIndicator {
-                    id: mediaDownloadIndicator
-
-                    running: innerAreaColumn.mediaDownloadInProgress > 0
-                    visible: running
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-            }
+            } // Column
+
         } // Flickable
     } // Component
 
+    property bool isEmbeddedMode: false
+
+    Panel {
+        id: operationsPanel
+
+        visible: rssItem != null
+        Rectangle { color: "#fafafa"; anchors.fill: parent }
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: units.gu(6)
+        Item {
+            anchors.fill: parent
+
+            ToolbarButton {
+                id: backBtn
+
+                visible: !isEmbeddedMode
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(1)
+                }
+                action: Action {
+                    iconSource: "./icons_tmp/back.svg"
+                    text:  i18n.tr("Back")
+                    onTriggered: {
+                        pageStack.pop()
+                    }
+                }
+            }
+
+            ToolbarButton {
+                id: optionsBtn
+
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: saveButton.left
+                    rightMargin: units.gu(1)
+                }
+
+                action: Action {
+                    text:  i18n.tr("Options")
+                    iconSource: "./icons_tmp/settings.svg"
+                    onTriggered: {
+                        PopupUtils.open(readingOptionsPopoverComponent, optionsBtn)
+                    }
+                }
+            }
+
+            ToolbarButton {
+                id: saveButton
+
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: openSiteBtn.left
+                    rightMargin: units.gu(1)
+                }
+                visible: rssItem != null
+                action: Action {
+                    text:  rssItem == null ? "" : (rssItem.favourite == "0" ? i18n.tr("Save") : i18n.tr("Remove"))
+                    iconSource: {
+                        if (rssItem == null || rssItem.favourite == "0")
+                            return Qt.resolvedUrl("./icons_tmp/favorite-unselected.svg")
+                        else return Qt.resolvedUrl("./icons_tmp/favorite-selected.svg")
+                    }
+                    onTriggered: {
+                        var fav = (rssItem.favourite == "0" ? "1" : "0")
+                        var dbResult = DB.updateArticleFavourite(rssItem.id, fav)
+                        if (dbResult.rowsAffected === 1) {
+                            articleFavouriteChanged(rssItem, fav)
+                        }
+                    }
+                }
+            } // Button
+
+            ToolbarButton {
+                id: openSiteBtn
+
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+                visible: rssItem != null
+                action: Action {
+                    text:  i18n.tr("Open site")
+                    iconSource: Qt.resolvedUrl("./icons_tmp/go-to.svg")
+                    onTriggered: {
+                        Qt.openUrlExternally(rssItem.link)
+                    }
+                }
+            } // Button
+        }
+    } // Panel
+
     Component {
-        id: mediaGroupImageComponent
-
-        Image {
-            id: mediaGroupImage
-
-            signal mediaLoadFinished
-
-            fillMode: Image.PreserveAspectFit
-            width: Math.min(sourceSize.width, articleViewRoot.width - units.gu(4))
-
-            onStatusChanged: {
-                if (status == Image.Ready)
-                    mediaLoadFinished()
-            }
-        }
-    }
+        id: readingOptionsPopoverComponent
+        ReadingOptions { }
+    } // Comp
 }
 
=== modified file 'ListModePage.qml'
--- ListModePage.qml	2014-09-02 06:34:00 +0000
+++ ListModePage.qml	2014-09-17 20:27:28 +0000
@@ -15,7 +15,7 @@
     property var listViewModel: null
     property bool isShorts: topicId == 0
 
-    property var listTools: listModeTools
+    // property var listTools: listModeTools
 
     function getListToots() {
         return listModeTools
@@ -234,6 +234,7 @@
     ArticleViewItem {
         id: listArticleView
 
+        isEmbeddedMode: mainView.isTabletMode
         height: parent.height
         anchors {
             left: articleList.right
@@ -245,90 +246,6 @@
         // onVisibleChanged: if (visible) showArticle(0)
     }
 
-    ToolbarItems {
-        id: listModeTools
-
-        visible: mainView.isTabletMode
-
-        back: ToolbarButton {
-            objectName: "rsspagerefreshbutton"
-            action: refreshAction
-        }
-
-        ToolbarButton {
-            objectName: "changemodebutton"
-            action: changeModeAction
-        }
-
-        ToolbarButton {
-            id: addReadsBtn
-            objectName: "addreadsbutton"
-            action: Action {
-                text:  i18n.tr("Add reads")
-                iconSource: Qt.resolvedUrl("icons_tmp/add.svg")
-                onTriggered: {
-                    PopupUtils.open(addReadsPopoverComp, addReadsBtn)
-                }
-            }
-        }
-
-        ToolbarButton {
-            objectName: "edittopicsbutton"
-            action: editTopicsAction
-        }
-
-        ToolbarButton {
-            id: readingOptionsButton
-
-            visible: true
-            action: Action {
-                text:  i18n.tr("Options")
-                iconSource: Qt.resolvedUrl("./icons_tmp/settings.svg")
-                onTriggered: {
-                    PopupUtils.open(readingOptionsPopoverComponent, readingOptionsButton)
-                }
-            }
-        }
-
-        ToolbarButton {
-            //visible: mainView.isTabletMode
-            objectName: "addRemoveFavor"
-
-            visible: listArticleView.rssItem != null
-            action: Action {
-                id: addRemoveFavor
-
-                text:  listArticleView.rssItem == null ? "" : (listArticleView.rssItem.favourite == "0" ? i18n.tr("Save") : i18n.tr("Remove"))
-                iconSource: {
-                    if (listArticleView.rssItem == null || listArticleView.rssItem.favourite == "0")
-                        return Qt.resolvedUrl("icons_tmp/favorite-unselected.svg")
-                    else return Qt.resolvedUrl("icons_tmp/favorite-selected.svg")
-                }
-                onTriggered: {
-                    var fav = (listArticleView.rssItem.favourite == "0" ? "1" : "0")
-                    var dbResult = DB.updateArticleFavourite(listArticleView.rssItem.id, fav)
-                    if (dbResult.rowsAffected == 1) {
-                        listArticleView.articleFavouriteChanged(listArticleView.rssItem, fav)
-                    }
-                }
-            }
-        }
-
-        ToolbarButton {
-            //visible: mainView.isTabletMode
-            objectName: "openSiteAction"
-            action: Action {
-                id: openSiteAction
-
-                text:  i18n.tr("Open site")
-                iconSource: Qt.resolvedUrl("icons_tmp/go-to.svg")
-                onTriggered: {
-                    Qt.openUrlExternally(listArticleView.rssItem.link)
-                }
-            }
-        }
-    } // ToolBarItems
-
     Component {
         id: readingOptionsPopoverComponent
 
 
=== modified file 'RssFeedPage.qml'
--- RssFeedPage.qml	2014-09-02 06:34:00 +0000
+++ RssFeedPage.qml	2014-09-17 20:27:28 +0000
@@ -30,55 +30,8 @@
         anchors.fill: parent
     }
 
-    tools: ToolbarItems {
-        objectName: "pageBackBtn"
-        id: toolbar
-
-        ToolbarButton {
-            id: readingOptionsButton
-
-            visible: true
-            action: Action {
-                text:  i18n.tr("Options")
-                iconSource: Qt.resolvedUrl("./icons_tmp/settings.svg")
-                onTriggered: {
-                    PopupUtils.open(readingOptionsPopoverComponent, readingOptionsButton)
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
-                text:  innerArticleView.rssItem == null ? "" : (innerArticleView.rssItem.favourite == "0" ? i18n.tr("Save") : i18n.tr("Remove"))
-                iconSource: {
-                    if (innerArticleView.rssItem == null || innerArticleView.rssItem.favourite == "0")
-                        return Qt.resolvedUrl("./icons_tmp/favorite-unselected.svg")
-                    else return Qt.resolvedUrl("./icons_tmp/favorite-selected.svg")
-                }
-                onTriggered: {
-                    var fav = (innerArticleView.rssItem.favourite == "0" ? "1" : "0")
-                    var dbResult = DB.updateArticleFavourite(innerArticleView.rssItem.id, fav)
-                    if (dbResult.rowsAffected === 1) {
-                        innerArticleView.articleFavouriteChanged(innerArticleView.rssItem, fav)
-                    }
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
-                text:  i18n.tr("Open site")
-                iconSource: Qt.resolvedUrl("./icons_tmp/go-to.svg")
-                onTriggered: {
-                    Qt.openUrlExternally(innerArticleView.rssItem.link)
-                }
-            }
-        }
-    }
-
     Component {
         id: readingOptionsPopoverComponent
-
         ReadingOptions { }
     } // Comp
 
 
=== modified file 'SavedTab.qml'
--- SavedTab.qml	2014-09-02 06:34:00 +0000
+++ SavedTab.qml	2014-09-17 20:27:28 +0000
@@ -15,7 +15,7 @@
     page: Page {
         id: contentPage
 
-        tools: (isListMode && mainView.isTabletMode) ? listPage.listTools : mainCommonToolbar
+        tools: /*(isListMode && mainView.isTabletMode) ? listPage.listTools :*/ mainCommonToolbar
 
         ListModePage {
             id: listPage
 
=== modified file 'ShortsTab.qml'
--- ShortsTab.qml	2014-09-02 06:34:00 +0000
+++ ShortsTab.qml	2014-09-17 20:27:28 +0000
@@ -16,7 +16,7 @@
     page: Page {
         id: contentPage
 
-        tools: (isListMode && mainView.isTabletMode) ? listPage.listTools : mainCommonToolbar
+        tools: /*(isListMode && mainView.isTabletMode) ? listPage.listTools :*/ mainCommonToolbar
 
         ListModePage {
             id: listPage
 
=== modified file 'TopicTab.qml'
--- TopicTab.qml	2014-09-02 06:34:00 +0000
+++ TopicTab.qml	2014-09-17 20:27:28 +0000
@@ -16,7 +16,7 @@
     page: Page {
         id: contentPage
 
-        tools: (isListMode && mainView.isTabletMode) ? listPage.listTools : mainCommonToolbar
+        tools: /*(isListMode && mainView.isTabletMode) ? listPage.listTools :*/ mainCommonToolbar
 
         ListModePage {
             id: listPage
 
=== removed file '[e-mail]'
 Binary files [e-mail]	2013-02-12 16:18:48 +0000 and [e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2014-09-02 06:34:00 +0000
+++ feeds/AppendFeedPage.qml	2014-09-17 20:27:28 +0000
@@ -33,73 +33,10 @@
 
     property bool isDirty: false // Need to clear all page content.
     property int selectedCount: 0
-    //.property var selectedFeeds: null // Become local.
     property bool resultsReceived: false // Indicates that at least once results were received.
 
-    // Workaround for bug #1231137
-    // set the tools to null, then add the toolbar manually when enter this page
-
-    tools: null
-
-    ToolbarItems {
-        id: appendFeedTools
-
-        opened: true
-        locked: true
-
-        back: Button {
-            anchors.verticalCenter: parent.verticalCenter
-            action: Action {
-                text:  i18n.tr("Cancel")
-
-                onTriggered:
-                {
-                    googleFeedApi.abort()
-                    pageStack.pop()
-                }
-            }
-        }
-
-        ActivityIndicator {
-            id: checkRunning
-
-            visible: googleFeedApi.inProgress
-            running: googleFeedApi.inProgress
-
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Button {
-            objectName: "nextButton"
-            id: nextBtn
-            anchors.verticalCenter: parent.verticalCenter
-
-            enabled: !googleFeedApi.inProgress && selectedCount > 0
-            action: Action {
-                text:  i18n.tr("Next")
-
-                onTriggered:
-                {
-                    if (!nextBtn.enabled)
-                        return
-
-                    var selectedFeeds = []
-                    for (var i = 0; i < searchResultsModel.count; i++) {
-                        var curItem = searchResultsModel.get(i)
-
-                        if (curItem.isSelected) {
-                            selectedFeeds.push(curItem)
-                        }
-                    }
-
-                    pageStack.push(chooseTopicPage, {"feedsToAdd" : selectedFeeds})
-                }
-            }
-        }
-    }
-
     function reloadPageContent() {
-        appendFeedPage.tools = appendFeedTools
+        // appendFeedPage.tools = appendFeedTools
         if (isDirty) {
             tfFeedUrl.text = ""
             resultsReceived = false
@@ -141,10 +78,10 @@
 
             for (var i = 0; i < entries.length; i++) {
                 searchResultsModel.append({"url" : entries[i].url,
-                                                 "title" : entries[i].title,
-                                                 "description" : entries[i].contentSnippet,
-                                                 "link" : entries[i].link,
-                                                 "isSelected" : false})
+                                              "title" : entries[i].title,
+                                              "description" : entries[i].contentSnippet,
+                                              "link" : entries[i].link,
+                                              "isSelected" : false})
             }
         }
 
@@ -167,10 +104,10 @@
             var feed = result.responseData.feed
 
             searchResultsModel.append({"url" : feed.feedUrl,
-                                             "title" : feed.title,
-                                             "description" : feed.description,
-                                             "link" : feed.link,
-                                             "isSelected" : false})
+                                          "title" : feed.title,
+                                          "description" : feed.description,
+                                          "link" : feed.link,
+                                          "isSelected" : false})
         }
     }
 
@@ -195,6 +132,7 @@
             placeholderText: i18n.tr("Type a keyword or URL")
 
             width: parent.width - units.gu(4)
+            // height:units.gu(5)
             anchors {
                 horizontalCenter: parent.horizontalCenter
             }
@@ -202,7 +140,7 @@
                 height: parent.height*0.5
                 width: height
                 anchors.verticalCenter: parent.verticalCenter
-//                anchors.verticalCenterOffset: -units.gu(0.2)
+                //                anchors.verticalCenterOffset: -units.gu(0.2)
                 source: Qt.resolvedUrl("../icons_tmp/find.svg")
                 smooth: true
 
@@ -255,7 +193,7 @@
         width: parent.width
         clip: true
         anchors {
-            bottom: parent.bottom
+            bottom: fakePanel.top
             // bottomMargin: appendFeedTools.height
             top: appendFeedColumn.bottom
         }
@@ -280,6 +218,82 @@
         }
     }
 
+    Rectangle {
+        id: fakePanel
+
+        color: "#fafafa"
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: units.gu(6)
+        Item {
+            anchors.fill: parent
+
+            Button {
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(1)
+                }
+                gradient: UbuntuColors.greyGradient
+                action: Action {
+                    text:  i18n.tr("Cancel")
+
+                    onTriggered: {
+                        googleFeedApi.abort()
+                        pageStack.pop()
+                    }
+                }
+            }
+
+            ActivityIndicator {
+                id: checkRunning
+
+                visible: googleFeedApi.inProgress
+                running: googleFeedApi.inProgress
+
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: nextBtn.left
+                    rightMargin: units.gu(1)
+                }
+            }
+
+            Button {
+                id: nextBtn
+                objectName: "nextButton"
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+
+                enabled: !googleFeedApi.inProgress && selectedCount > 0
+                action: Action {
+                    text:  i18n.tr("Next")
+
+                    onTriggered: {
+                        if (!nextBtn.enabled)
+                            return
+
+                        var selectedFeeds = []
+                        for (var i = 0; i < searchResultsModel.count; i++) {
+                            var curItem = searchResultsModel.get(i)
+
+                            if (curItem.isSelected) {
+                                selectedFeeds.push(curItem)
+                            }
+                        }
+
+                        pageStack.push(chooseTopicPage, {"feedsToAdd" : selectedFeeds})
+                    }
+                }
+            } // Button
+        }
+    } // Rectangle fakePanel
+
     ListModel {
         id: searchResultsModel
     }
 
=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2014-09-02 06:34:00 +0000
+++ feeds/ChooseTopicPage.qml	2014-09-17 20:27:28 +0000
@@ -14,35 +14,10 @@
     flickable: null
 
     property var feedsToAdd: null
-
     signal topicChoosen(int topicId, var addedFeeds)
 
-    // Workaround for bug #1231137
-    // set the tools to null, then add the toolbar manually when enter this page
-
-    tools: null
-
-    ToolbarItems {
-        id: appendFeedTools
-
-        opened: true
-        locked: true
-
-        back: Button {
-            anchors.verticalCenter: parent.verticalCenter
-            action: Action {
-                text:  i18n.tr("Previous")
-
-                onTriggered:
-                {
-                    pageStack.pop()
-                }
-            }
-        }
-    }
-
     function reloadPageContent() {
-        chooseTopicPage.tools = appendFeedTools
+        // chooseTopicPage.tools = appendFeedTools
         suggestionTopicsModel.clear()
 
         var tags = DB.loadTags()
@@ -105,76 +80,76 @@
         }
 
         footer: Item {
-            width: parent.width
-            height: tfNewTopicName.height + units.gu(2)
-
-            TextField {
-                objectName: "newTopic"
-                id: tfNewTopicName
-
-                placeholderText: i18n.tr(" + New topic")
-
-                width: parent.width - units.gu(4)
-                anchors {
-                    horizontalCenter: parent.horizontalCenter
-                    verticalCenter: parent.verticalCenter
-                }
-
-                Connections {
-                    id: connKeyBroad
-                    target: Qt.inputMethod
-
-                    onVisibleChanged: {
-                        if (Qt.inputMethod.visible && pageStack && (pageStack.currentPage == chooseTopicPage)) {
-//                            console.log("kb show up", Qt.inputMethod.keyboardRectangle.height)
-//                            suggestionTopics.positionViewAtEnd()
-                            timerKeyboard.start()
-                        }
-                    }
-                }
-
-                /* a bad workaround for forcing TextField to show on the top of keyboard
-                   flick the listview doesn't work because the keyboard needs about 400ms to show from bottom to top
-                   if better workarounds come out, pls use it to replace the current one
-                */
-                Timer {
-                    id: timerKeyboard
-                    interval: 400; running: false; repeat: false; triggeredOnStart: false
-                    onTriggered: suggestionTopics.positionViewAtEnd()
-                }
-
-                onAccepted: {
-                    // Qt.inputMethod.hide()
-                    var tagName = text.replace(/^\s+|\s+$/g, '')  // Trimming whitespaces.
-                    if (tagName != "") { // Check that tagName contains only spaces.
-
-                        /* Make first letter capital.
-                         */
-                        tagName = tagName.charAt(0).toUpperCase() + tagName.slice(1)
-
-                        var dbResult = DB.addTag(tagName)
-
-                        if (dbResult.error) {
-                            PopupUtils.open(errorDialogComponent, chooseTopicPage,
-                                            {"text" : i18n.tr("A topic with this name already exists"),
-                                                "title" : i18n.tr("Warning")})
-                            return
-                        }
-
-                        suggestionTopicsModel.append({"tagName" : tagName,
-                                                         "tagId" : dbResult.tagId})
-
-                        text = ""
-
-                        appendFeedsToTopic(dbResult.tagId)
-                    } else {
-                        PopupUtils.open(errorDialogComponent, chooseTopicPage,
-                                        {"text" : i18n.tr("Topic name can't contain only whitespaces"),
-                                            "title" : i18n.tr("Warning")})
-                    }
-                }
-            }
-        }
+                    width: parent.width
+                    height: tfNewTopicName.height + units.gu(2)
+
+                    TextField {
+                        objectName: "newTopic"
+                        id: tfNewTopicName
+
+                        placeholderText: i18n.tr(" + New topic")
+
+                        width: parent.width - units.gu(4)
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                            verticalCenter: parent.verticalCenter
+                        }
+
+                        Connections {
+                            id: connKeyBroad
+                            target: Qt.inputMethod
+
+                            onVisibleChanged: {
+                                if (Qt.inputMethod.visible && pageStack && (pageStack.currentPage == chooseTopicPage)) {
+        //                            console.log("kb show up", Qt.inputMethod.keyboardRectangle.height)
+        //                            suggestionTopics.positionViewAtEnd()
+                                    timerKeyboard.start()
+                                }
+                            }
+                        }
+
+                        /* a bad workaround for forcing TextField to show on the top of keyboard
+                           flick the listview doesn't work because the keyboard needs about 400ms to show from bottom to top
+                           if better workarounds come out, pls use it to replace the current one
+                        */
+                        Timer {
+                            id: timerKeyboard
+                            interval: 400; running: false; repeat: false; triggeredOnStart: false
+                            onTriggered: suggestionTopics.positionViewAtEnd()
+                        }
+
+                        onAccepted: {
+                            // Qt.inputMethod.hide()
+                            var tagName = text.replace(/^\s+|\s+$/g, '')  // Trimming whitespaces.
+                            if (tagName != "") { // Check that tagName contains only spaces.
+
+                                /* Make first letter capital.
+                                 */
+                                tagName = tagName.charAt(0).toUpperCase() + tagName.slice(1)
+
+                                var dbResult = DB.addTag(tagName)
+
+                                if (dbResult.error) {
+                                    PopupUtils.open(errorDialogComponent, chooseTopicPage,
+                                                    {"text" : i18n.tr("A topic with this name already exists"),
+                                                        "title" : i18n.tr("Warning")})
+                                    return
+                                }
+
+                                suggestionTopicsModel.append({"tagName" : tagName,
+                                                                 "tagId" : dbResult.tagId})
+
+                                text = ""
+
+                                appendFeedsToTopic(dbResult.tagId)
+                            } else {
+                                PopupUtils.open(errorDialogComponent, chooseTopicPage,
+                                                {"text" : i18n.tr("Topic name can't contain only whitespaces"),
+                                                    "title" : i18n.tr("Warning")})
+                            }
+                        }
+                    }
+                }
 
         delegate: ListItem.Standard {
             objectName: "topicItem"
 
=== modified file 'feeds/CreateTopicPage.qml'
--- feeds/CreateTopicPage.qml	2014-09-02 06:34:00 +0000
+++ feeds/CreateTopicPage.qml	2014-09-17 20:27:28 +0000
@@ -15,76 +15,88 @@
 
     signal topicAdded()
 
-
-
-    tools: null
-
-    ToolbarItems {
-        id: createTopicTools
-
-        opened: true
-        locked: true
-
-        back: Button {
-            anchors.verticalCenter: parent.verticalCenter
-            action: Action {
-                text:  i18n.tr("Cancel")
-
-                onTriggered: {
-                    pageStack.pop()
-                }
-            }
+    Rectangle {
+        id: fakePanel
+
+        color: "#fafafa"
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
         }
-
-        Button {
-            id: addTopicBtn
-
-            enabled: tfTopicName.length > 0
-            anchors.verticalCenter: parent.verticalCenter
-            action: Action {
-                text:  i18n.tr("Add topic")
-
-                onTriggered:
-                {
-                    if (!addTopicBtn.enabled)
-                        return
-
-                    var topicName = tfTopicName.text.replace(/^\s+|\s+$/g, '') // Trimming whitespaces.
-                    if (topicName == "") {
-                        PopupUtils.open(errorDialogComponent, createTopicPage,
-                                        {"text" : i18n.tr("Topic name can't contain only whitespaces"),
-                                            "title" : i18n.tr("Warning")})
-                        return
+        height: units.gu(6)
+        Item {
+            anchors.fill: parent
+
+            Button {
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(1)
+                }
+                action: Action {
+                    text:  i18n.tr("Cancel")
+
+                    onTriggered: {
+                        pageStack.pop()
                     }
-
-                    /* Make first letter capital.
-                     */
-                    topicName = topicName.charAt(0).toUpperCase() + topicName.slice(1)
-
-                    var dbResult = DB.addTag(topicName)
-                    if (dbResult.error) {
-                        PopupUtils.open(errorDialogComponent, createTopicPage,
-                                        {"text" : i18n.tr("A topic with this name already exists"),
-                                            "title" : i18n.tr("Warning")})
-                        return
-                    } else {
-                        tfTopicName.text = ""
-
-                        for( var i = 0; i < suggestionFeedsModel.count; i++) {
-                            var curItem = suggestionFeedsModel.get(i)
-
-                            if (curItem.feedSelected) {
-                                DB.addFeedTag(curItem.feedId, dbResult.tagId)
+                }
+            }
+
+            Button {
+                id: addTopicBtn
+
+                enabled: tfTopicName.length > 0
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+                action: Action {
+                    text:  i18n.tr("Add topic")
+
+                    onTriggered:
+                    {
+                        if (!addTopicBtn.enabled)
+                            return
+
+                        var topicName = tfTopicName.text.replace(/^\s+|\s+$/g, '') // Trimming whitespaces.
+                        if (topicName == "") {
+                            PopupUtils.open(errorDialogComponent, createTopicPage,
+                                            {"text" : i18n.tr("Topic name can't contain only whitespaces"),
+                                                "title" : i18n.tr("Warning")})
+                            return
+                        }
+
+                        /* Make first letter capital.
+                         */
+                        topicName = topicName.charAt(0).toUpperCase() + topicName.slice(1)
+
+                        var dbResult = DB.addTag(topicName)
+                        if (dbResult.error) {
+                            PopupUtils.open(errorDialogComponent, createTopicPage,
+                                            {"text" : i18n.tr("A topic with this name already exists"),
+                                                "title" : i18n.tr("Warning")})
+                            return
+                        } else {
+                            tfTopicName.text = ""
+
+                            for( var i = 0; i < suggestionFeedsModel.count; i++) {
+                                var curItem = suggestionFeedsModel.get(i)
+
+                                if (curItem.feedSelected) {
+                                    DB.addFeedTag(curItem.feedId, dbResult.tagId)
+                                }
                             }
                         }
+
+                        topicAdded()
+                        pageStack.pop()
                     }
-
-                    topicAdded()
-                    pageStack.pop()
                 }
-            }
+            } // Button
         }
-    }
+    } // Rectangle fakePanel
 
     function reloadPageContent() {
         suggestionFeedsModel.clear()
@@ -140,8 +152,8 @@
         width: parent.width
         clip: true
         anchors {
-            bottom: parent.bottom
-            bottomMargin: createTopicTools.height
+            bottom: fakePanel.top
+            // bottomMargin: createTopicTools.height
             top: someColumn.bottom
         }
 
 
=== modified file 'feeds/TopicComponent.qml'
--- feeds/TopicComponent.qml	2014-09-02 06:34:00 +0000
+++ feeds/TopicComponent.qml	2014-09-17 20:27:28 +0000
@@ -182,7 +182,7 @@
                     id: inputTopicName
                     anchors.verticalCenter: parent.verticalCenter
                     text: topicName
-                    width: rowTopicContent.isEditing ? headerTopic.width - units.gu(15) : 0
+                    width: rowTopicContent.isEditing ? headerTopic.width - units.gu(11) : 0
                     opacity: rowTopicContent.isEditing ? 1 : 0
                     hasClearButton: true
                     activeFocusOnPress: true
 
=== modified file 'feeds/TopicManagement.qml'
--- feeds/TopicManagement.qml	2014-09-02 06:34:00 +0000
+++ feeds/TopicManagement.qml	2014-09-17 20:27:28 +0000
@@ -7,8 +7,8 @@
 import "../databasemodule_v2.js" as DB
 
 Page {
+    id: topicManagement
     objectName: "topicmanagement"
-    id: topicManagement
 
     title: i18n.tr("Edit topics")
     flickable: content
@@ -17,8 +17,9 @@
     signal feedEdit(int topicId)
     signal topicDeleted()
 
-    Component.onCompleted:
-    {
+    property int editIndex
+
+    Component.onCompleted: {
         reloadTopics ()
     }
 
@@ -45,60 +46,69 @@
         topicManagement.flickable = content
     }
 
-    /*
-      toolbar for normal state
-    */
-    ToolbarItems {
-        id: toolbar
-
-        ToolbarButton {
-            id: actionsButton
-            text: i18n.tr("Add Feed")
-            iconSource: Qt.resolvedUrl("../icons_tmp/add.svg")
-            onTriggered: pageStack.push(appendFeedPage/*, {"isDirty" : true}*/) ;
-            visible: true
-        }
-    }
-
-    /*
-      toolbar for editing state
-    */
-    ToolbarItems {
-        id: editConfirm
-        opened: true
-        locked: true
-        visible: false
-//        anchors.bottom: content.bottom
-
-        property int editIndex
-
-        back: Button {
-            id: cancelButton
-            text: i18n.tr("Cancel")
-            gradient: UbuntuColors.greyGradient
-            anchors.verticalCenter: parent.verticalCenter
-            onClicked: {
-                Qt.inputMethod.hide()
-                topicList.currentItem.cancelEdit()
-                topicManagement.state = ""
-                editConfirm.visible = false
-                topicList.currentIndex = -1
-                timerHeader.start()
-            }
-        }
-
-        Button {
-            id: confirmButton
-            text: i18n.tr("Confirm")
-            anchors.verticalCenter: parent.verticalCenter
-            onClicked: {
-                topicList.currentItem.confirmEdit()
-                topicManagement.state = ""
-                editConfirm.visible = false
-                topicList.currentIndex = -1
-            }
-        }
-    }
+    Rectangle {
+        id: fakePanel
+
+        color: "#fafafa"
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: units.gu(6)
+        Item {
+            anchors.fill: parent
+
+            Button {
+                id: cancelButton
+                text: i18n.tr("Cancel")
+                gradient: UbuntuColors.greyGradient
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(1)
+                }
+                visible: topicManagement.state == "editMode"
+                onClicked: {
+                    Qt.inputMethod.hide()
+                    topicList.currentItem.cancelEdit()
+                    topicManagement.state = "default"
+                    // editConfirm.visible = false
+                    topicList.currentIndex = -1
+                    timerHeader.start()
+                }
+            }
+
+            Button {
+                id: confirmButton
+                text: i18n.tr("Confirm")
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+                visible: topicManagement.state == "editMode"
+                onClicked: {
+                    topicList.currentItem.confirmEdit()
+                    topicManagement.state = "default"
+                    // editConfirm.visible = false
+                    topicList.currentIndex = -1
+                }
+            }
+
+            Button {
+                id: actionsButton
+                text: i18n.tr("Add Feed")
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+                visible: topicManagement.state != "editMode"
+                onClicked: pageStack.push(appendFeedPage/*, {"isDirty" : true}*/)
+            }
+        }
+    } // Rectangle fakePanel
 
     /*
       main content
@@ -106,7 +116,10 @@
     Flickable {
         id: content
         anchors {
-            fill: parent
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: fakePanel.top
         }
         contentHeight: contentItem.childrenRect.height
 //        boundsBehavior: (contentHeight > topicManagement.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
@@ -235,17 +248,17 @@
                             onEdit: {
                                 if (topicList.currentItem)
                                     topicList.currentItem.cancelEdit()
-                                editConfirm.editIndex = index
+                                topicManagement.editIndex = index
                                 topicManagement.state = "editMode"
-                                editConfirm.visible = true
+                                // editConfirm.visible = true
                                 topicList.currentIndex = index
                             }
 
                             onEditCanceled: {
                                 if (topicList.currentItem)
                                     topicList.currentItem.cancelEdit()
-                                topicManagement.state = ""
-                                editConfirm.visible = false
+                                topicManagement.state = "default"
+                                // editConfirm.visible = false
                                 topicList.currentIndex = -1
                             }
 
@@ -365,7 +378,7 @@
 
         function anchorToKeyboard() {
             if (topicList.currentItem.isEditing && Qt.inputMethod.visible) {
-                var kbTemp = mainView.height - mainView.header.height - Qt.inputMethod.keyboardRectangle.height - editConfirm.height
+                var kbTemp = mainView.height - mainView.header.height - Qt.inputMethod.keyboardRectangle.height - /*editConfirm.height*/ fakePanel.height
                 var yChange = topicList.delegateRootY + topicList.y - kbTemp + topicList.currentItem.height
                 if (yChange > 0) {
                     content.contentY += yChange
@@ -406,18 +419,18 @@
 
     states: [
         State {
-            name: ""
-            PropertyChanges {
-                target: topicManagement
-                tools: toolbar
-            }
+            name: "default"
+//            PropertyChanges {
+//                target: topicManagement
+//                tools: toolbar
+//            }
         },
         State {
             name: "editMode"
-            PropertyChanges {
-                target: topicManagement
-                tools: editConfirm
-            }
+//            PropertyChanges {
+//                target: topicManagement
+//                tools: editConfirm
+//            }
         }
     ]
 
 
=== added file 'icons_tmp/back.svg'
--- icons_tmp/back.svg	1970-01-01 00:00:00 +0000
+++ icons_tmp/back.svg	2014-09-17 20:27:28 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3140" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="90" width="90" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3145">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(0 -962.36)">
+  <rect id="rect4198" style="color:#000000;fill:none" height="90" width="90" y="962.36" x="0"/>
+  <g id="g4978" transform="translate(-60 548)">
+   <path id="path4984" style="color:#000000;fill:#808080" transform="matrix(3.5011 0 0 3.5548 -307.21 -174.5)" d="m113.92 179.14c-0.52479 0.30299-8.7464-4.4438-8.7464-5.0498 0-0.60597 8.2216-5.3527 8.7464-5.0498 0.52478 0.30299 0.52478 9.7965 0 10.1z"/>
+   <path id="path4988" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#808080" d="m87 438.36v12l39 0.002c12-0.0002 12-0.0002 12 8.9998v9c0 9 0 9-12 9.0002l-15-0.002v12l9 0.002c27 0 30 0 30-18v-15.002c0-17.998-3-17.998-30-17.998z"/>
+   <rect id="rect3038" style="color:#000000;fill:none" transform="translate(60 414.36)" height="90" width="90" y=".000017383" x="0"/>
+  </g>
+ </g>
+</svg>
 
=== modified file 'shorts-app.qml'
--- shorts-app.qml	2014-09-02 06:34:00 +0000
+++ shorts-app.qml	2014-09-17 20:27:28 +0000
@@ -29,6 +29,8 @@
     width: units.gu(100)
     height: units.gu(80)
 
+    useDeprecatedToolbar: false
+
     headerColor: "#3a2c32"
     backgroundColor: "#875864"
     footerColor: "#9b616c"
@@ -233,16 +235,25 @@
                     repeater.itemAt(tabstabs.selectedTabIndex - 2).showContent()
                 }
 
-                mainCommonToolbar.opened = false
+                // mainCommonToolbar.opened = false
             } // onTriggered
         }
 
         Action {
             id: addReadsAction
-            text:  i18n.tr("Add reads")
             iconSource: Qt.resolvedUrl("./icons_tmp/add.svg")
+//            text:  i18n.tr("Add reads")
+//            onTriggered: {
+//                PopupUtils.open(addReadsPopoverComp, addReadsBtn)
+//            }
+            text: i18n.tr("Add feeds")
             onTriggered: {
-                PopupUtils.open(addReadsPopoverComp, addReadsBtn)
+                /* When we want to show "Append feed" page from
+                 * any page except of "Choose topic",
+                 * we should clear it (mark as dirty).
+                 * ATTENTION: similar call can be found in hotkeys section.
+                 */
+                pageStack.push(appendFeedPage, {"isDirty" : true})
             }
         }
 
@@ -255,17 +266,13 @@
             }
         }
 
-
-
-
-
         /* -------------------------- Toolbars ---------------------------- */
 
 
         ToolbarItems {
             id: mainCommonToolbar
 
-            back: ToolbarButton {
+            /*back: */ToolbarButton {
                 objectName: "rsspagerefreshbutton"
                 action: refreshAction
             }
 
=== modified file 'tests/autopilot/shorts_app/__init__.py'
--- tests/autopilot/shorts_app/__init__.py	2014-08-05 12:37:10 +0000
+++ tests/autopilot/shorts_app/__init__.py	2014-09-17 20:27:28 +0000
@@ -13,7 +13,6 @@
 
 from autopilot import logging as autopilot_logging
 from testtools.matchers import NotEquals
-from autopilot.introspection import dbus
 
 from ubuntuuitoolkit import (
     base,
@@ -94,28 +93,47 @@
 
     @autopilot_logging.log_action(logger.info)
     def go_to_add_feeds(self):
-        popover = self._click_add_reads()
-        try:
-            popover.click_button_by_text('+ Add feeds')
-        except dbus.StateNotFoundError:
-            pass
-        return self.select_single(
-            AppendFeedPage, objectName='appendfeedpage')
+        self._click_add_reads()
+        return self.wait_select_single(AppendFeedPage)
 
     @autopilot_logging.log_action(logger.info)
     def go_to_edit_feeds(self):
         """Go to the edit feeds page."""
-        toolbar = self.open_toolbar()
-        action_item = toolbar.select_single(
-            'ActionItem', objectName='edittopicsbutton')
-        self.pointing_device.click_object(action_item)
+        # does not work using workaround
+        # header = self.get_header()
+        # header.click_action_button('Edit topics')
+
+        # -------------------------------------------------------------------
+        # this will have to bee removed after fixing above header issue
+        actionsButton = self.wait_select_single(
+            "PageHeadButton", objectName='actions_overflow_button')
+        self.pointing_device.click_object(actionsButton)
+        popover = self.wait_select_single(
+            "StyledItem", objectName="popover_foreground")
+        addReadsAction = popover.wait_select_single(
+            "AbstractButton", text="Edit topics")
+        self.pointing_device.click_object(addReadsAction)
+        # -----------------------------------------------------------------
+
         return self.wait_select_single(
             TopicManagement, objectName='topicmanagement')
 
     def _click_add_reads(self):
-        toolbar = self.open_toolbar()
-        toolbar.click_button('addreadsbutton')
-        return self.get_action_selection_popover('addreadspopover')
+        # does not work using workaround
+        # header = self.get_header()
+        # header.click_action_button('Add feeds')
+
+        # -------------------------------------------------------------------
+        # this will have to bee removed after fixing above header issue
+        actionsButton = self.wait_select_single(
+            "PageHeadButton", objectName='actions_overflow_button')
+        self.pointing_device.click_object(actionsButton)
+        popover = self.wait_select_single(
+            "StyledItem", objectName="popover_foreground")
+        addReadsAction = popover.wait_select_single(
+            "AbstractButton", text="Add feeds")
+        self.pointing_device.click_object(addReadsAction)
+        # -----------------------------------------------------------------
 
     def get_selected_tab_title(self):
         tabs = self.get_tabs()
@@ -125,17 +143,6 @@
         tab = tabs.select_single('TopicTab', index=selected_tab_index)
         return tab.title
 
-    # ideally this should be converted to the sdk
-    # and use object name not text names
-    # see https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
-    def run_action(self, popover, name):
-        actions = popover.select_many("Empty")
-        requested = None
-        for action in actions:
-            if action.text == name:
-                requested = action
-        self.pointing_device.click_object(requested)
-
     def select_many_retry(self, object_type, **kwargs):
         """Returns the item that is searched for with app.select_many
         In case of no item was not found (not created yet) a second attempt is
@@ -148,10 +155,6 @@
             tries = tries - 1
         return items
 
-    def get_action_popover(self):
-        # Returns all instances, but with current one as first index
-        return self.select_many_retry("ActionSelectionPopover")[0]
-
     def get_network_activity(self):
         try:
             activity = self.select_single("ActivityIndicator", running="True")
@@ -204,14 +207,6 @@
         return self.select_single("Button", objectName="deleteButton")
 
     # Page Calls
-    def get_append_page(self):
-        return self.select_single("AppendFeedPage",
-                                  objectName="appendfeedpage")
-
-    def get_topics_page(self):
-        return self.select_single("ChooseTopicPage",
-                                  objectName="choosetopicpage")
-
     def get_feedlist_page(self):
         return self.wait_select_single("FeedListPage",
                                        objectName="feedlistpage")
@@ -322,9 +317,38 @@
         return valueselector.select_single("LabelVisual", text=name)
 
     @autopilot_logging.log_action(logger.info)
-    def change_view_mode(self):
-        toolbar = self.open_toolbar()
-        toolbar.click_button("changemodebutton")
+    def change_view_mode(self, mode):
+        """Change view mode.
+
+        :parameter mode: if you are in list mode it equals "isListMode"
+                         if you are not in list mode it equals "isNotListMode"
+
+        """
+
+        # does not work using workaround
+        """
+        header = self.get_header()
+        if mode == "isListMode":
+            header.click_action_button("Grid View")
+        else:
+            header.click_action_button("List view")
+        """
+        # -------------------------------------------------------------------
+        # this will have to bee removed after fixing above header issue
+        actionsButton = self.wait_select_single(
+            "PageHeadButton", objectName='actions_overflow_button')
+        self.pointing_device.click_object(actionsButton)
+        popover = self.wait_select_single(
+            "StyledItem", objectName="popover_foreground")
+        if mode == "isListMode":
+            addReadsAction = popover.wait_select_single(
+                "AbstractButton", text="Grid View")
+        else:
+            addReadsAction = popover.wait_select_single(
+                "AbstractButton", text="List view")
+
+        self.pointing_device.click_object(addReadsAction)
+        # -----------------------------------------------------------------
 
 
 class Page(toolkit_emulators.MainView):
@@ -337,12 +361,6 @@
         # --elopio - 2014-02-26
         self.main_view = self.get_root_instance().select_single(MainView)
 
-    @autopilot_logging.log_action(logger.info)
-    def click_next(self):
-        toolbar = self.main_view.get_toolbar()
-        next_button = toolbar.select_single('Button', objectName='nextButton')
-        self.pointing_device.click_object(next_button)
-
 
 class AppendFeedPage(Page):
 
@@ -356,6 +374,12 @@
         search_text_field.write(keyword_or_url + '\n')
         self._wait_for_results_to_appear()
 
+    @autopilot_logging.log_action(logger.info)
+    def click_next_button(self):
+        next_button = self.wait_select_single(
+            'Button', objectName='nextButton')
+        self.pointing_device.click_object(next_button)
+
     def _wait_for_results_to_appear(self):
         results_list = self._get_results_list()
         results_list.count.wait_for(NotEquals(0))
@@ -375,7 +399,7 @@
             self._check_result(result)
 
     def click_next(self):
-        super(AppendFeedPage, self).click_next()
+        self.click_next_button()
         return self.main_view.select_single(
             ChooseTopicPage, objectName='choosetopicpage')
 
 
=== modified file 'tests/autopilot/shorts_app/tests/test_rssreader.py'
--- tests/autopilot/shorts_app/tests/test_rssreader.py	2014-06-27 15:12:42 +0000
+++ tests/autopilot/shorts_app/tests/test_rssreader.py	2014-09-17 20:27:28 +0000
@@ -19,10 +19,9 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals, Is, Not
+from testtools.matchers import Equals, NotEquals
 
 from shorts_app.tests import ShortsAppTestCase
-from time import sleep
 import unittest
 import logging
 
@@ -37,11 +36,8 @@
 
     def setUp(self):
         super(BaseShortsAppTestCase, self).setUp()
+        self.shorts_app.main_view.visible.wait_for(True)
 
-        self.assertThat(
-            self.shorts_app.main_view.visible,
-            Eventually(Equals(True))
-        )
         # wait for any updates to finish before beginning tests
         self._wait_for_refresh()
 
@@ -84,66 +80,27 @@
         selected_tab_title = self.shorts_app.main_view.get_selected_tab_title()
         self.assertEqual('Test topic', selected_tab_title)
 
-    def _input_new_feed(self, rssFeed):
-        inputField = self.shorts_app.main_view.get_append_feed_input_box()
-        return self._safe_enter_text(inputField, rssFeed)
-
-    def _input_new_topic(self, topic):
-        inputField = self.shorts_app.main_view.get_new_topic_input_box()
-        return self._safe_enter_text(inputField, topic)
-
-    def _safe_enter_text(self, inputField, text, timeout=10):
-        # poll clicking for focus for lack of better method,
-        # due to screen switching animation
-        # is there a property we can use instead?
-        poll = 0
-        while not inputField.focus and poll < timeout:
-            self.pointing_device.click_object(inputField)
-            sleep(1)
-            poll += 1
-        self.keyboard.type(text)
-        self.assertThat(inputField.text, Eventually(Equals(text)))
-        self.keyboard.press_and_release("Enter")
-        return inputField
-
-    def _get_topic(self, topicName, timeout=10):
-        logger.debug("_get_topic: assert topics")
-        self.assertThat(
-            lambda: self.shorts_app.main_view.get_feedlist_topic(topicName),
-            Eventually(Not(Is([]))))
-        logger.debug("_get_topic: grab topic")
-        topic = self.shorts_app.main_view.get_feedlist_topic(topicName)
-        logger.debug("_get_topic: click topic")
-
-        poll = 0
-        while not topic.isExpanded and poll < timeout:
-            logger.debug("_get_topic: loop click topic")
-            self.pointing_device.click_object(topic)
-            sleep(1)
-            poll += 1
-        return topic
-
     def test_switch_to_list_view_mode(self):
         """ test switching to list view  mode"""
         shorts_tab = self.shorts_app.main_view.get_shorts_tab()
-        self.ensure_grid_view_mode(shorts_tab)
-        self.shorts_app.main_view.change_view_mode()
+        self._ensure_grid_view_mode(shorts_tab)
+        self.shorts_app.main_view.change_view_mode("isNotListMode")
         self.assertThat(shorts_tab.isListMode, Eventually(Equals(True)))
 
     def test_switch_to_grid_view_mode(self):
         """ test switching to grid view  mode"""
         shorts_tab = self.shorts_app.main_view.get_shorts_tab()
-        self.ensure_list_view_mode(shorts_tab)
-        self.shorts_app.main_view.change_view_mode()
+        self._ensure_list_view_mode(shorts_tab)
+        self.shorts_app.main_view.change_view_mode("isListMode")
         self.assertThat(shorts_tab.isListMode, Eventually(Equals(False)))
 
-    def ensure_grid_view_mode(self, current_tab):
+    def _ensure_grid_view_mode(self, current_tab):
         if current_tab.isListMode:
-            self.shorts_app.main_view.change_view_mode()
+            self.shorts_app.main_view.change_view_mode("isListMode")
 
-    def ensure_list_view_mode(self, current_tab):
+    def _ensure_list_view_mode(self, current_tab):
         if not current_tab.isListMode:
-            self.shorts_app.main_view.change_view_mode()
+            self.shorts_app.main_view.change_view_mode("isNotListMode")
 
     def test_open_listmode_feed_item(self):
         """"test to ensure list mode feed items can be opened"""
@@ -154,7 +111,7 @@
 
         self.add_feed_to_new_topic(test_feed_url, test_feed_title, test_topic)
         new_topic_tab = self.shorts_app.main_view.get_topic_tab(test_topic)
-        self.ensure_list_view_mode(new_topic_tab)
+        self._ensure_list_view_mode(new_topic_tab)
 
         self.shorts_app.main_view.open_feed_item(test_topic, test_feed_title)
         self.assertEqual(