Merge lp:~costales/unav/same-btns-place into lp:unav

[costales]

Same buttons all time

[lp:~costales/unav/same-btns-place]

211. By costales on 2018-05-16

Updated version to 1.1

=== modified file 'manifest.json'
--- manifest.json	2018-03-24 18:18:57 +0000
+++ manifest.json	2018-05-16 19:40:38 +0000
@@ -12,5 +12,5 @@
 	"maintainer": "Marcos Costales <[e-mail]>",
 	"name": "navigator.costales",
 	"title": "uNav",
-	"version": "1.0"
+	"version": "1.1"
 }

=== modified file 'qml/Main.qml'
--- qml/Main.qml	2018-03-24 18:18:57 +0000
+++ qml/Main.qml	2018-05-16 19:40:38 +0000
@@ -61,7 +61,7 @@
         width: unavWindow.width + units.gu(0.1) //TODO: Investigate why this is needed
         height: unavWindow.height + units.gu(0.1) //TODO: Investigate why this is needed
 
-        property string applicationVersion: "1.0"
+        property string applicationVersion: "1.1"
         property string mapUrl: "../nav/index.html"
         property string appUA: "Mozilla/5.0 (Linux; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36 Project uNav"
 
@@ -930,7 +930,7 @@
                             }
 
                             Row {
-                                spacing: units.gu(2)
+                                spacing: units.gu(0.5)
                                 anchors.horizontalCenter: parent.horizontalCenter
 
                                 GridIconDelegate {
@@ -949,12 +949,38 @@
                                 }
 
                                 GridIconDelegate {
-                                    icon.name: "call-start"
-                                    icon.height: units.gu(3)
-                                    highlightSize: units.gu(-1)
-                                    visible: goThereActionPopover.phone !== ""
-                                    onClicked: {
-                                        Qt.openUrlExternally("tel:///" + QmlJs.parse_poi_phone(goThereActionPopover.phone))
+                                    icon.name: mainPageStack.favPopup ? "starred" : "non-starred"
+                                    icon.height: units.gu(3)
+                                    highlightSize: units.gu(-1)
+                                    onClicked: {
+                                        mainPageStack.favPopup = !mainPageStack.favPopup;
+                                        mainPageStack.showSideBar();
+                                        var incubator = mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("SearchPage.qml"), {favLat: mainPageStack.clickedLat, favLng: mainPageStack.clickedLng, favName: ""});
+                                        incubator.onStatusChanged = function(status) {
+                                            if (status === Component.Ready) {
+                                                incubator.object.addFavorite();
+                                            }
+                                        }
+                                    }
+                                }
+
+                                GridIconDelegate {
+                                    icon.name: "location"
+                                    icon.height: units.gu(3)
+                                    highlightSize: units.gu(-1)
+                                    onClicked: {
+                                        mainPageStack.showSideBar();
+                                        mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.clickedLat, "lng": mainPageStack.clickedLng});
+                                    }
+                                }
+
+                                GridIconDelegate {
+                                    icon.name: "share"
+                                    icon.height: units.gu(3)
+                                    highlightSize: units.gu(-1)
+                                    onClicked: {
+                                        mainPageStack.showSideBar();
+                                        mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("Share.qml"), {"lat": mainPageStack.clickedLat, "lon": mainPageStack.clickedLng, "isParentPage": true});
                                     }
                                 }