Merge lp:~nik90/unav/fix-pagestack-navigation into lp:unav

[Nekhelesh Ramananthan]

Revamped the pagestack navigation code. pop() and clear() are quite clever at what page they pop.

Improves the pagestack navigation code massively. No more headaches on which page gets pushed from which page and so on. This is how it was meant to be written ;)

[costales (costales)]

Great work :)

review: Approve

=== modified file 'qml/Coordinate.qml'
--- qml/Coordinate.qml	2016-04-03 10:34:22 +0000
+++ qml/Coordinate.qml	2016-04-05 19:49:15 +0000
@@ -101,7 +101,7 @@
                         mainPageStack.clickedLng = parseFloat(aux_lng).toFixed(5);
                         if (mainPageStack.center_onpos === 2)
                             mainPageStack.center_onpos = 1;
-                        mainPageStack.pop(coordPage);
+                        mainPageStack.clear();
                         mainPageStack.executeJavaScript(
                                     "ui.markers_POI_set([{title: '', lat: " + mainPageStack.clickedLat + ", lng: " + mainPageStack.clickedLng + "}]);"
                                     );
@@ -305,7 +305,7 @@
                             mainPageStack.clickedLng = parseFloat(aux_lng).toFixed(5);
                             if (mainPageStack.center_onpos === 2)
                                 mainPageStack.center_onpos = 1;
-                            mainPageStack.pop(coordPage);
+                            mainPageStack.clear();
                             mainPageStack.executeJavaScript(
                                         "ui.markers_POI_set([{title: '', lat: " + mainPageStack.clickedLat + ", lng: " + mainPageStack.clickedLng + "}]);"
                                         );
 
=== modified file 'qml/FavoritesPage.qml'
--- qml/FavoritesPage.qml	2016-04-03 08:11:41 +0000
+++ qml/FavoritesPage.qml	2016-04-05 19:49:15 +0000
@@ -59,14 +59,16 @@
         visible: header === standardHeader
         z: 500
         flickable: favoritesListView
+        // #FIXME: This back button is only here to allow the user to press Escape to go back.
+        // This feature will be implemented upstream by the SDK devs when they add keyboard shortcuts to pages,
+        // at which point this back button can be removed.
         leadingActionBar.actions: Action {
             iconName: "back"
             text: i18n.tr("Back")
             shortcut: "Escape"
             enabled: header === standardHeader
             onTriggered: {
-                mainPageStack.pop(favoritesPage)
-                mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+                mainPageStack.pop()
             }
         }
         trailingActionBar.actions: Action {
@@ -130,7 +132,7 @@
                     Action {
                         iconName: "send"
                         onTriggered: {
-                            mainPageStack.pop(favoritesPage);
+                            mainPageStack.clear();
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes';
                             mainPageStack.executeJavaScript("calc2coord("+ model.lat + "," + model.lng + ");");
@@ -162,7 +164,7 @@
             }
 
             onClicked: {
-                mainPageStack.pop(favoritesPage);
+                mainPageStack.clear()
                 if (navApp.settings.saveHistory) {
                     UnavDB.saveTofavHistory(model.name, model.lat, model.lng);
                 }
@@ -215,7 +217,7 @@
             }
             Action {
                 text: i18n.tr("Add From Map")
-                onTriggered: mainPageStack.pop(favoritesPage);
+                onTriggered: mainPageStack.clear()
             }
         }
     }
 
=== modified file 'qml/Nearby.qml'
--- qml/Nearby.qml	2016-04-01 14:18:40 +0000
+++ qml/Nearby.qml	2016-04-05 19:49:15 +0000
@@ -26,13 +26,15 @@
         title: i18n.tr("Nearby")
         flickable: flickable
         
+        // #FIXME: This back button is only here to allow the user to press Escape keyboard key to go back.
+        // This feature will be implemented upstream by the SDK devs when they add keyboard shortcuts to pages,
+        // at which point this back button can be removed.
         leadingActionBar.actions: Action {
             iconName: "back"
             text: i18n.tr("Back")
             shortcut: "Escape"
             onTriggered: {
-                mainPageStack.pop(nearbyPage)
-                mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+                mainPageStack.pop()
             }
         }
     }
@@ -68,11 +70,12 @@
                 icon.source: model.source
 
                 onClicked: {
-                    mainPageStack.pop(nearbyPage);
                     if (model.mode === "CURRENT") {
                         mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Nearby.qml", "lat": mainPageStack.currentLat, "lng": mainPageStack.currentLng})
                     } else if (model.mode === "DESTINATION") {
                         mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Nearby.qml", "lat": mainPageStack.endLat, "lng": mainPageStack.endLng})
+                    } else if (model.mode === "MAP") {
+                        mainPageStack.clear(); // Show map
                     }
                 }
             }
 
=== modified file 'qml/PoiListPage.qml'
--- qml/PoiListPage.qml	2016-04-03 11:11:50 +0000
+++ qml/PoiListPage.qml	2016-04-05 19:49:15 +0000
@@ -44,8 +44,7 @@
                 if (mainPageStack.center_onpos === 2)
                     mainPageStack.center_onpos = 1;
                 mainPageStack.executeJavaScript("ui.markers_POI_set(" + JSON.stringify(sortedPoiModel.allPOI()) + ");")
-                mainPageStack.pop(poiListPage.fromPage)
-                mainPageStack.pop(poiListPage)
+                mainPageStack.clear()
             }
         }
     }
@@ -259,8 +258,7 @@
                     Action {
                         iconName: "send"
                         onTriggered: {
-                            mainPageStack.pop(poiListPage.fromPage)
-                            mainPageStack.pop(poiListPage)
+                            mainPageStack.clear()
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes'
                             mainPageStack.executeJavaScript("calc2coord("+ model.lat + "," + model.lng + ");");
@@ -269,8 +267,6 @@
                     Action {
                         iconName: "non-starred"
                         onTriggered: {
-                            mainPageStack.pop(poiListPage.fromPage)
-                            mainPageStack.pop(poiListPage)
                             mainPageStack.push(Qt.resolvedUrl("FavoritesPage.qml"), {isAddedFromPopup: true, lat: model.lat, lng: model.lng, favName: model.name})
                         }
                     },
@@ -298,8 +294,7 @@
             }
 
             onClicked: {
-                mainPageStack.pop(poiListPage.fromPage)
-                mainPageStack.pop(poiListPage);
+                mainPageStack.clear()
                 mainPageStack.executeJavaScript("ui.markers_POI_set([{title: \"" + model.name + "\", lat: " + model.lat + ", lng: " + model.lng + ", website: \"" + model.website + "\", phone: \"" + model.phone + "\"}]);");
             }
 
 
=== modified file 'qml/PoiPage.qml'
--- qml/PoiPage.qml	2016-03-31 18:20:06 +0000
+++ qml/PoiPage.qml	2016-04-05 19:49:15 +0000
@@ -35,14 +35,6 @@
     header: standardHeader
     anchors.fill: parent
 
-    function goBackStandardMode() {
-        mainPageStack.pop(poiPage);
-        if (poiPage.fromPage === "RoutePage.qml")
-            mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"));
-        if (poiPage.fromPage === "Nearby.qml")
-            mainPageStack.push(Qt.resolvedUrl("Nearby.qml"));
-    }
-
     function goBackSearchMode() {
         categoryList.forceActiveFocus()
         poiPage.header = standardHeader
@@ -62,7 +54,7 @@
             iconName: "back"
             text: i18n.tr("Back")
             onTriggered: {
-                goBackStandardMode()
+                mainPageStack.pop()
             }
         }
 
 
=== modified file 'qml/RoutePage.qml'
--- qml/RoutePage.qml	2016-04-01 14:18:40 +0000
+++ qml/RoutePage.qml	2016-04-05 19:49:15 +0000
@@ -62,7 +62,6 @@
                 visible: model.visible
 
                 onClicked: {
-                    mainPageStack.pop(routePage)
                     if (model.mode === "FAVORITES") {
                         mainPageStack.push(Qt.resolvedUrl("FavoritesPage.qml"))
                     } else if (model.mode === "SEARCH") {
@@ -76,6 +75,7 @@
                     } else if (model.mode === "CANCEL") {
                         mainPageStack.routeState = 'no';
                         mainPageStack.executeJavaScript("click_cancel_route();")
+                        mainPageStack.pop()
                     }
                 }
             }
 
=== modified file 'qml/SearchPage.qml'
--- qml/SearchPage.qml	2016-03-30 01:01:54 +0000
+++ qml/SearchPage.qml	2016-04-05 19:49:15 +0000
@@ -30,12 +30,14 @@
     header: PageHeader {
         title: i18n.tr("Search")
         flickable: statusLabel.visible ? resultsListView : historyListView
+        // #FIXME: This back button is only here to allow the user to press Escape keyboard key to go back.
+        // This feature will be implemented upstream by the SDK devs when they add keyboard shortcuts to pages,
+        // at which point this back button can be removed.
         leadingActionBar.actions: Action {
             iconName: "back"
             text: i18n.tr("Back")
             onTriggered: {
-                mainPageStack.pop(searchPage)
-                mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+                mainPageStack.pop()
             }
         }
 
@@ -261,7 +263,7 @@
                         iconName: "send"
                         visible: model.title !== i18n.tr("Nearby history")
                         onTriggered: {
-                            mainPageStack.pop(searchPage);
+                            mainPageStack.clear();
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes';
                             mainPageStack.executeJavaScript("calc2coord("+ model.lat + "," + model.lng + ");");
@@ -307,7 +309,7 @@
                                         geoDistFactor: 5
                                     })
                 } else {
-                    mainPageStack.pop(searchPage);
+                    mainPageStack.clear();
                     mainPageStack.executeJavaScript("ui.markers_POI_set([{ title: \"" +
                                                                            model.name + "\", lat: " +
                                                                            model.lat + ", lng: " +
@@ -336,7 +338,7 @@
                             if (navApp.settings.saveHistory) {
                                 UnavDB.saveToSearchHistory(model.name, model.lat, model.lng)
                             }
-                            mainPageStack.pop(searchPage);
+                            mainPageStack.clear();
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes'
                             mainPageStack.executeJavaScript("calc2coord(" + model.lat + "," + model.lng + ");")
@@ -351,7 +353,6 @@
                     Action {
                         iconName: "non-starred"
                         onTriggered: {
-                            mainPageStack.pop(searchPage)
                             mainPageStack.push(Qt.resolvedUrl("FavoritesPage.qml"), {isAddedFromPopup:true, lat: model.lat, lng: model.lng, favName: model.name})
                         }
                     }
@@ -362,7 +363,7 @@
                 if (navApp.settings.saveHistory) {
                     UnavDB.saveToSearchHistory(model.name, model.lat, model.lng);
                 }
-                mainPageStack.pop(searchPage);
+                mainPageStack.clear();
                 mainPageStack.executeJavaScript("ui.markers_POI_set([{title: \"" + model.name + "\", lat: " + model.lat + ", lng: " + model.lng + "}]);");
             }
 
 
=== modified file 'qml/SharePage.qml'
--- qml/SharePage.qml	2016-04-01 14:18:40 +0000
+++ qml/SharePage.qml	2016-04-05 19:49:15 +0000
@@ -27,13 +27,15 @@
         title: i18n.tr("Share Position")
         flickable: flickable
         
+        // #FIXME: This back button is only here to allow the user to press Escape keyboard key to go back.
+        // This feature will be implemented upstream by the SDK devs when they add keyboard shortcuts to pages,
+        // at which point this back button can be removed.
         leadingActionBar.actions: Action {
             iconName: "back"
             text: i18n.tr("Back")
             shortcut: "Escape"
             onTriggered: {
-                mainPageStack.pop(sharePage)
-                mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+                mainPageStack.pop()
             }
         }
     }
@@ -74,7 +76,7 @@
                     } else if (model.model === "DESTINATION") {
                         PopupUtils.open(Qt.resolvedUrl("./Share.qml"), navApp, {"lat": mainPageStack.endLat, "lon": mainPageStack.endLng})
                     } else if (model.mode === "MAP") {
-                        mainPageStack.pop(sharePage); // Show map
+                        mainPageStack.clear(); // Show map
                     }
                 }
             }