Rework user interface

Remove unused toolbar icon, made search bar optional

diff --git a/application/resources/harmattan/qml/SearchBar.qml b/application/resources/harmattan/qml/SearchBar.qml
index 36a3ba1..7850b10 100644 (file)
--- a/application/resources/harmattan/qml/SearchBar.qml
+++ b/application/resources/harmattan/qml/SearchBar.qml
@@ -10,7 +10,7 @@ BorderImage {
     border.right: 10
     border.top: 10
     border.bottom: 10
-    height:  UiConstants.SearchBarDefaultHeight
+    height:  visible ? UiConstants.SearchBarDefaultHeight : 0
     source: style.background
 
     ToolBarStyle {

diff --git a/application/resources/harmattan/qml/StationListPage.qml b/application/resources/harmattan/qml/StationListPage.qml
index 04272c6..c676d1b 100644 (file)
--- a/application/resources/harmattan/qml/StationListPage.qml
+++ b/application/resources/harmattan/qml/StationListPage.qml
@@ -10,8 +10,7 @@ Page {
     id: stationListPage
     tools: ToolBarLayout {
         id: toolBar
-        ToolIcon { iconId: "icon-m-toolbar-back"; onClicked: pageStack.pop(); }
-        ToolIcon { iconId: "icon-m-toolbar-settings"; onClicked: settingsSheet.open(); }
+        ToolIcon { iconId: "icon-m-toolbar-search"; onClicked: searchField.visible = !searchField.visible; }
         ToolIcon { iconId: "icon-m-toolbar-view-menu"; onClicked: menu.open() }
     }
     Menu {
@@ -54,6 +53,7 @@ Page {
     SearchBar {
         id: searchField
         anchors.top: header.bottom
+        visible: false
     }
     Binding {
         target: stationListProxyModel