Merge lp:~qqworini/ubuntu-rssreader-app/fix-bug-1298114 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

fix-bug-1298114

also fix another same bug in topic management page

fix-bug-1298114

also fix another same bug in topic management page

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

PASSED: Continuous integration, rev:226
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/227/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2761
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2761/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/298
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/114
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/6

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

review: Approve (continuous-integration)

=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2014-05-21 09:56:25 +0000
+++ feeds/ChooseTopicPage.qml	2014-05-22 02:46:14 +0000
@@ -94,7 +94,7 @@
         anchors {
             left: parent.left; right: parent.right
             top: parent.top; bottom: parent.bottom
-            bottomMargin: Qt.inputMethod.keyboardRectangle.height
+//            bottomMargin: Qt.inputMethod.keyboardRectangle.height
         }
 
         model: suggestionTopicsModel
@@ -130,12 +130,24 @@
                     target: Qt.inputMethod
 
                     onVisibleChanged: {
-                        if (Qt.inputMethod.visible) {
-                            suggestionTopics.positionViewAtEnd()
+                        if (Qt.inputMethod.visible && (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: 500; running: false; repeat: false; triggeredOnStart: false
+                    onTriggered: suggestionTopics.contentY += Qt.inputMethod.keyboardRectangle.height
+                }
+
                 onAccepted: {
                     if (inputAccepted === false) { // TODO: Bug #1321680
                         Qt.inputMethod.hide()
 
=== modified file 'feeds/TopicManagement.qml'
--- feeds/TopicManagement.qml	2014-04-23 16:06:04 +0000
+++ feeds/TopicManagement.qml	2014-05-22 02:46:14 +0000
@@ -78,10 +78,12 @@
             gradient: UbuntuColors.greyGradient
             anchors.verticalCenter: parent.verticalCenter
             onClicked: {
+                Qt.inputMethod.hide()
                 topicList.currentItem.cancelEdit()
                 topicManagement.state = ""
                 editConfirm.visible = false
                 topicList.currentIndex = -1
+                timerHeader.start()
             }
         }
 
@@ -104,13 +106,10 @@
     Flickable {
         id: content
         anchors {
-            left: parent.left; right: parent.right
-            top: parent.top; bottom: parent.bottom
-//            topMargin: topicManagement.header.height
-            bottomMargin: Qt.inputMethod.keyboardRectangle.height
+            fill: parent
         }
         contentHeight: contentItem.childrenRect.height
-        boundsBehavior: (contentHeight > topicManagement.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+//        boundsBehavior: (contentHeight > topicManagement.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
 
         /*
           idea from music app, set interactive to false may work
@@ -168,6 +167,7 @@
 
                 property int feedSelectedIndex: -1
                 property alias flickState: content.state
+                property real delegateRootY
 
                 signal collapseAllItem()
 
@@ -201,6 +201,7 @@
 
                         property int visualIndex: VisualDataModel.itemsIndex
                         property alias isExpanded: topicItem.isExpanded
+                        property alias isEditing: topicItem.isEditing
                         property bool isSelected: visualIndex == topicList.feedSelectedIndex
 
                         anchors{ left: parent.left; right: parent.right }
@@ -306,10 +307,10 @@
                             target: Qt.inputMethod
 
                             onVisibleChanged: {
-                                if (topicItem.isEditing && Qt.inputMethod.visible) {
-                                    var kbTemp = topicManagement.height - Qt.inputMethod.keyboardRectangle.height
-                                    if (delegateRoot.y > kbTemp)
-                                        content.contentY += (delegateRoot.y - kbTemp)
+                                if ((pageStack.currentPage == topicManagement) && Qt.inputMethod.visible) {
+                                    topicList.delegateRootY = topicList.currentItem.y
+                                    timerKeyboard.stop()
+                                    timerKeyboard.start()
                                 }
                             }
                         }
@@ -353,6 +354,32 @@
         } // column
     } // flickable
 
+    /* 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: 500; running: false; repeat: false; triggeredOnStart: false
+        onTriggered: anchorToKeyboard()
+
+        function anchorToKeyboard() {
+            if (topicList.currentItem.isEditing && Qt.inputMethod.visible) {
+                var kbTemp = mainView.height - mainView.header.height - Qt.inputMethod.keyboardRectangle.height - editConfirm.height
+                var yChange = topicList.delegateRootY + topicList.y - kbTemp + topicList.currentItem.height
+                if (yChange > 0) {
+                    content.contentY += yChange
+                }
+            }
+        }
+    }
+
+    Timer {
+        id: timerHeader
+        interval: 500; running: false; repeat: false; triggeredOnStart: false
+        onTriggered: topicManagement.header.show()
+    }
+
     Connections{
         id: connAddTopic
         target: createTopicPage