Merge lp:~mrqtros/ubuntu-rssreader-app/ubuntu-rssreader-app-loadmore-reworked into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Roman Shchekin]

loadMoreItems now more intellectual
+ Few little improvements.

loadMoreItems now more intellectual
+ Few little improvements.

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

PASSED: Continuous integration, rev:286
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/256/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1416
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1416/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/35

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

review: Approve (continuous-integration)

=== modified file 'OrganicGrid.qml'
--- OrganicGrid.qml	2014-08-05 07:06:44 +0000
+++ OrganicGrid.qml	2014-08-08 06:06:45 +0000
@@ -14,7 +14,7 @@
     property bool canReload: false
 
     // this value will be changed if the app's width changed
-    property int numberAddMore: 12
+    readonly property int numberAddMore: 4
 
     // connect to MainView's sizeChanged signal
     Connections{
@@ -26,8 +26,6 @@
     }
 
     function sizeChangedHandler() {
-        var num = 12 * (1 + width / height)
-        numberAddMore = num > 12 ? num : 12
         if (canReload) {
             canReload = false
             clear()
@@ -111,9 +109,9 @@
 
         console.time("loadmore")
 
-        for(var i = currentLoadedIndex; i < currentLoadedIndex + numAdd; i++) {
+        for(;;) {
+            var i = currentLoadedIndex++
             var article = articleModel.get(i);
-            //var imageArray = [article.image]
             var hasImage = (article.image !== "") ? 0x2 : 0x0
             var useAlternateDelegate = (Math.random() > 0.5) ? 0x1 : 0
 
@@ -127,19 +125,26 @@
 
             var properties = {
                 "modelItem": article,
-                //"imageArray": imageArray,
                 "rssModel": articleModel,
                 "modelIndex": i
             }
 
             var articleItem = component.createObject(organicFlickable.contentItem, properties)
             itemsPlacer.placeObject(articleItem)
-            // articleItem.secretProp = article.title // TODO BUG
             addToListWithSort(articleItem)
+
+            if (--numAdd <= 0) {
+                var lix = articleItem.x // "x" coordinate of last item.
+                amountToGo = articleModel.count - currentLoadedIndex
+                /* We should try to add few items more if some free space left of the screen. */
+                if (lix < organicFlickable.contentX + organicFlickable.width && amountToGo > 0) {
+                    numAdd = amountToGo > numberAddMore ? numberAddMore : amountToGo
+                    // console.log("Few items more: ", numAdd)
+                } else break
+            }
         }
 
         itemsPlacer.clearTemporaries()
-        currentLoadedIndex += numAdd
         organicFlickable.canAdd = true
         console.timeEnd("loadmore")
 

=== modified file 'XmlNetwork.qml'
--- XmlNetwork.qml	2014-08-05 10:08:24 +0000
+++ XmlNetwork.qml	2014-08-08 06:06:45 +0000
@@ -122,8 +122,8 @@
                 }
             }
         }
-	console.log("getFirstImage")
-        console.log(e.content) 
+        // console.log("getFirstImage")
+        // console.log(e.content)
         var image = ImageUtils.getFirstImage(e.content)
         if (image != null) {
             return image

=== modified file 'imgSeparator.js'
--- imgSeparator.js	2014-08-05 10:08:24 +0000
+++ imgSeparator.js	2014-08-08 06:06:45 +0000
@@ -4,7 +4,7 @@
 
 
     image_array = rss_content.split("<img")
-    console.log("SPLIT");
+    // console.log("SPLIT");
 
     image_array.shift() ;
 

=== modified file 'shorts-app.qml'
--- shorts-app.qml	2014-08-02 18:40:48 +0000
+++ shorts-app.qml	2014-08-08 06:06:45 +0000
@@ -26,7 +26,7 @@
     applicationName: "com.ubuntu.shorts"
     anchorToKeyboard: true
 
-    width: units.gu(50)
+    width: units.gu(100)
     height: units.gu(80)
 
     headerColor: "#3a2c32"