Merge lp:~ahayzen/music-app/remix-store-tab-index into lp:music-app/remix

[Andrew Hayzen]

* Restore the tab index the user was on when starting the app

* Restore the tab index the user was on when starting the app

TESTING:
* Test when you have no settings and no recent - Expect Albums
* Test when you have no setting but do have recent - Expect Recent
* Test when you have settings (already stored tabIndex) - Expect stored result from last application run

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

PASSED: Continuous integration, rev:741
http://91.189.93.70:8080/job/music-app-remix-ci/267/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/223
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/42

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/267/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:741
http://91.189.93.70:8080/job/music-app-ci/1149/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/224
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/224/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/1

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1149/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I tested this to force the stored tabIndex to be larger then the number of possible tabs and the initial view it lands on (Recent) is empty until a different tab is selected. I think we might want to ensure that the index we set "tabs.selectedTabIndex" to is within the number of possible tabs.

review: Needs Fixing

[lp:~ahayzen/music-app/remix-store-tab-index]

742. By Andrew Hayzen on 2014-11-15

* Protect against a too high saved index

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

PASSED: Continuous integration, rev:742
http://91.189.93.70:8080/job/music-app-remix-ci/271/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/231
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/46

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/271/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:742
http://91.189.93.70:8080/job/music-app-ci/1153/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/232
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/5

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1153/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Shouldn't the condition being added be an OR rather than and AND?

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

Oh damn I was still thinking the wrong way around as I was originally going todo !== -1 :P

[lp:~ahayzen/music-app/remix-store-tab-index]

743. By Andrew Hayzen on 2014-11-15

* Switch to using OR

744. By Andrew Hayzen on 2014-11-15

* Actually fix it this time :P

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2014-11-12 01:45:00 +0000
+++ music-app.qml	2014-11-15 21:56:24 +0000
@@ -47,6 +47,7 @@
         category: "StartupSettings"
 
         property int queueIndex: 0
+        property int tabIndex: -1
     }
 
     // Global keyboard shortcuts
@@ -564,11 +565,13 @@
         // push the page to view
         mainPageStack.push(tabs)
 
+        // if a tab index exists restore it, otherwise goto Recent if there are items otherwise go to Albums
+        tabs.selectedTabIndex = startupSettings.tabIndex === -1 || startupSettings.tabIndex > tabs.count - 1
+                ? (Library.isRecentEmpty() ? albumsTab.index : startTab.index)
+                : startupSettings.tabIndex
+
         loadedUI = true;
 
-        // goto Recent if there are items otherwise go to Albums
-        tabs.selectedTabIndex = Library.isRecentEmpty() ? albumsTab.index : startTab.index
-
         // Run post load
         tabs.ensurePopulated(tabs.selectedTab);
 
@@ -893,6 +896,12 @@
                 fill: parent
             }
 
+            onSelectedTabIndexChanged: {
+                if (loadedUI) {  // store the tab index if changed by the user
+                    startupSettings.tabIndex = selectedTabIndex
+                }
+            }
+
             // First tab is all music
             Tab {
                 property bool populated: false