Merge lp:~nik90/unav/add-custom-back-buttons into lp:unav

[Nekhelesh Ramananthan]

Adds custom back buttons for all pages to overcome upstream SDK bug fix which is causing a critical regression in uNav where the default back buttons are hidden when page depth is 1.

[lp:~nik90/unav/add-custom-back-buttons]

52. By Nekhelesh Ramananthan on 2016-04-18

merged lp:unav

53. By Nekhelesh Ramananthan on 2016-04-18

Fix positioning of search label

54. By Nekhelesh Ramananthan on 2016-04-18

Reverted the removal of hiding leading action bar in Main.qml since it appears in stable channel but not the rc-proposed channel

[costales (costales)]

+1! Nice touch ;)

review: Approve

=== modified file 'qml/AboutPage.qml'
--- qml/AboutPage.qml	2016-04-10 09:43:33 +0000
+++ qml/AboutPage.qml	2016-04-18 21:20:29 +0000
@@ -26,6 +26,18 @@
     header: UNavHeader {
         title: i18n.tr("About")
         flickable: creditsListView
+
+        // #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()
+            }
+        }
     }
 
     ListModel {

=== modified file 'qml/PoiListPage.qml'
--- qml/PoiListPage.qml	2016-04-17 22:32:48 +0000
+++ qml/PoiListPage.qml	2016-04-18 21:20:29 +0000
@@ -35,6 +35,19 @@
     header: UNavHeader {
         title: poiType
         flickable: resultsListView
+
+        // #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()
+            }
+        }
+
         trailingActionBar.actions: Action {
             id: routeAction
             iconSource: "../nav/img/header/poimap.svg"

=== modified file 'qml/SearchPage.qml'
--- qml/SearchPage.qml	2016-04-17 16:42:49 +0000
+++ qml/SearchPage.qml	2016-04-18 21:20:29 +0000
@@ -60,9 +60,30 @@
     header: UNavHeader {
         id: standardHeader
 
-        title: i18n.tr("Search")
         flickable: typeSections.selectedIndex !== 2 ? mainLoader.item.flickable : null
 
+        // #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()
+            }
+        }
+
+        contents: Label {
+            textSize: Label.Large
+            color: "White"
+            font.weight: Font.Light
+            text: i18n.tr("Search")
+            verticalAlignment: Text.AlignVCenter
+            width: parent.width; height: units.gu(4)
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
         trailingActionBar.actions: Action {
             id: actionButton
             iconSource: Qt.resolvedUrl("../nav/img/header/favorite-new.svg")

=== modified file 'qml/Share.qml'
--- qml/Share.qml	2016-04-15 21:08:18 +0000
+++ qml/Share.qml	2016-04-18 21:20:29 +0000
@@ -27,6 +27,18 @@
 
     header: UNavHeader {
         title: i18n.tr("Share location to")
+
+        // #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()
+            }
+        }
     }
 
     Component {