Merge lp:~nik90/unav/improve-favorite-page into lp:unav

[Nekhelesh Ramananthan]

- Migrated Favorite page to PageHeaders
- Replaced all uses of old listitems with new listitem
- Removed excessive calls of the initialize() function
- Simplified the logic of the empty state component

----------- Merge for uNav 0.58! -----------------

This MP improves the favorite page code wise only. Visuals are unchanged.

[JkB (joergberroth)]

Most alright; one thing

1. The header
Should hide when scrolling.
Right now it is fix, transparent and ListItem is visible underneath.

review: Needs Fixing

[costales (costales)]

Good improvement!

I would propose this improvement: Sort a new favorite.
https://code.launchpad.net/~costales/unav/improve-favorite-page

A hug :)

[JkB (joergberroth)]

Hey,

if there is more time for improvements:
A trailing action to edit the favorite name would also be a nice feature

Best Joerg

Am 2016-03-28 um 20:41 schrieb costales:
> Good improvement!
>
> I would propose this improvement: Sort a new favorite.
> https://code.launchpad.net/~costales/unav/improve-favorite-page
>
> A hug :)
>

[lp:~nik90/unav/improve-favorite-page]

14. By Nekhelesh Ramananthan on 2016-03-28

Scroll header automatically when scrolling listview

15. By Nekhelesh Ramananthan on 2016-03-28

merged lp:~costales/unav/improve-favorite-page

[Nekhelesh Ramananthan (nik90)]

> Most alright; one thing
>
> 1. The header
> Should hide when scrolling.
> Right now it is fix, transparent and ListItem is visible underneath.

Fixed in commit rev 14.

[Nekhelesh Ramananthan (nik90)]

> Good improvement!
>
> I would propose this improvement: Sort a new favorite.
> https://code.launchpad.net/~costales/unav/improve-favorite-page
>
> A hug :)

Merged in rev 15. Thnx for the code.

[Nekhelesh Ramananthan (nik90)]

> Hey,
>
> if there is more time for improvements:
> A trailing action to edit the favorite name would also be a nice feature
>
> Best Joerg

Hi Joerg, that would be an excellent addition. I would like to do that in a new MP if you don't mind. But I will implement it :). Thanks for the idea!

[JkB (joergberroth)]

now, the header actions seem to be gone.

Best Joerg

Am 2016-03-28 um 21:07 schrieb Nekhelesh Ramananthan:
>> Most alright; one thing
>>
>> 1. The header
>> Should hide when scrolling.
>> Right now it is fix, transparent and ListItem is visible underneath.
>
> Fixed in commit rev 14.
>

[Nekhelesh Ramananthan (nik90)]

What header actions? I can see the "+" header action and click it to add favorites.

review: Needs Information

[JkB (joergberroth)]

Am 2016-03-28 um 21:31 schrieb Nekhelesh Ramananthan:
> Review: Needs Information
>
> What header actions? I can see the "+" header action and click it to add favorites.
>
strange, on my install the back and add action do not work anymore. what
are you on? rc-prop or stable?

I will investigate.

[costales (costales)]

After a few more tests I found this (only on phone):
1. Center pos.
2. Click on Route > Favorites > +
3. Go back. Nothing happen.
4. Click clear field. Nothing happen.
Best regards!

[JkB (joergberroth)]

exactly same for me, yes.

Am 2016-03-28 um 22:19 schrieb costales:
> After a few more tests I found this (only on phone):
> 1. Center pos.
> 2. Click on Route > Favorites > +
> 3. Go back. Nothing happen.
> 4. Click clear field. Nothing happen.
> Best regards!
>

[JkB (joergberroth)]

It seems that somethings lays itself over the header.

The
z: 500
property would solve the problem.

(i am on krillin rc-proposed)

Best Joerg

Am 2016-03-28 um 22:27 schrieb JkB:
> exactly same for me, yes.
>
> Am 2016-03-28 um 22:19 schrieb costales:
>> After a few more tests I found this (only on phone):
>> 1. Center pos.
>> 2. Click on Route > Favorites > +
>> 3. Go back. Nothing happen.
>> 4. Click clear field. Nothing happen.
>> Best regards!
>>
>

=== modified file 'qml/FavoritesPage.qml'
--- qml/FavoritesPage.qml	2016-03-26 18:53:17 +0000
+++ qml/FavoritesPage.qml	2016-03-28 19:06:40 +0000
@@ -16,9 +16,7 @@
  */
 
 import QtQuick 2.4
-import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components.Popups 1.3
 import QtQuick.LocalStorage 2.0
 import "js/utils.js" as QmlJs
@@ -30,146 +28,92 @@
     property string lat
     property string lng
     property string favName
-
-    title: i18n.tr("Favorites")
+    property bool isAddedFromPopup: false
+
+    Component.onCompleted: {
+        if (isAddedFromPopup) {
+            addPOIFromPopup()
+        }
+    }
+
+    header: standardHeader
     anchors.fill: parent
 
-    state: "default"
-    states: [
-        PageHeadState {
-            name: "default"
-            head: favoritesPage.head
-
-            backAction: Action {
-                iconName: "back"
-                text: i18n.tr("Back")
-                onTriggered: {
-                    mainPageStack.pop(favoritesPage)
-                    mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
-                }
-            }
-            actions: Action {
-                iconName: "add"
-                text: i18n.tr("Add Favorite")
-                onTriggered: {
-                    addActionList.show();
-                }
-            }
-        },
-
-        PageHeadState {
-            name: "adding"
-            head: favoritesPage.head
-
-            Component.onCompleted: favNameField.forceActiveFocus();
-
-            backAction: Action {
-                iconName: "back"
-                text: i18n.tr("Back")
-                onTriggered: {
-                    mainPageStack.pop(favoritesPage)
-                    mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
-                }
-            }
-
-            contents: TextField {
-                id: favNameField
-                anchors {
-                    rightMargin: units.gu(2)
-                }
-                width:  parent ? parent.width - units.gu(2) : undefined
-
-                inputMethodHints: Qt.ImhNoPredictiveText
-                hasClearButton: true
-                placeholderText: i18n.tr("Insert a favorite name")
-                text: (favoritesPage.favName !== "" && favoritesPage.favName !== i18n.tr("Current Position")) ? favoritesPage.favName : ""
-                onTriggered: {
-                    if (text.length > 0 && favNameField.text !== "") {
-                        var exist_fav = UnavDB.getFavorite(favNameField.text);
-                        if (exist_fav[0] === null || exist_fav[1] === null) {
-                            UnavDB.saveFavorite(favNameField.text, favoritesPage.lat, favoritesPage.lng);
-                            favoritesModel.initialize();
-                            favoritesPage.state = "default";
-                        }
-                        else {
-                            PopupUtils.open(confirmOverwrite)
-                        }
+    function addPOIFromPopup() {
+        if (favoritesPage.favName) {
+            var exist_fav = UnavDB.getFavorite(favoritesPage.favName);
+            if (exist_fav[0] === null || exist_fav[1] === null) {
+                UnavDB.saveFavorite(favoritesPage.favName, favoritesPage.lat, favoritesPage.lng)
+                favoritesModel.initialize()
+            }
+            else {
+                header = addHeader
+                favNameField.text = favoritesPage.favName
+                PopupUtils.open(confirmOverwrite);
+            }
+        }
+        favoritesPage.isAddedFromPopup = false
+    }
+
+    PageHeader {
+        id: standardHeader
+        title: i18n.tr("Favorites")
+        visible: header === standardHeader
+        flickable: favoritesListView
+        leadingActionBar.actions: Action {
+            iconName: "back"
+            text: i18n.tr("Back")
+            shortcut: "Escape"
+            enabled: header === standardHeader
+            onTriggered: {
+                mainPageStack.pop(favoritesPage)
+                mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+            }
+        }
+        trailingActionBar.actions: Action {
+            id: actionButton
+            iconName: "add"
+            shortcut: "Ctrl+N"
+            text: i18n.tr("Add Favorite")
+            onTriggered: {
+                addActionList.show()
+            }
+        }
+    }
+
+    PageHeader {
+        id: addHeader
+        visible: header === addHeader
+        flickable: favoritesListView
+        leadingActionBar.actions:Action {
+            iconName: "back"
+            text: i18n.tr("Back")
+            shortcut: "Escape"
+            enabled: header === addHeader
+            onTriggered: {
+                header = standardHeader
+                favNameField.text = ""
+            }
+        }
+        contents: TextField {
+            id: favNameField
+            width: parent.width
+            anchors.verticalCenter: parent.verticalCenter
+            inputMethodHints: Qt.ImhNoPredictiveText
+            hasClearButton: true
+            placeholderText: i18n.tr("Insert a favorite name")
+            text: (favoritesPage.favName !== "" && favoritesPage.favName !== i18n.tr("Current Position")) ? favoritesPage.favName : ""
+            onTriggered: {
+                if (text.length > 0 && favNameField.text !== "") {
+                    var exist_fav = UnavDB.getFavorite(favNameField.text);
+                    if (exist_fav[0] === null || exist_fav[1] === null) {
+                        UnavDB.saveFavorite(favNameField.text, favoritesPage.lat, favoritesPage.lng)
+                        favoritesModel.initialize()
+                        favoritesPage.header = standardHeader
                     } else {
-                        favNameField.text = "";
-                    }
-                }
-            }
-        },
-
-        PageHeadState {
-            name: "addingFromPopup"
-            head: favoritesPage.head
-
-            Component.onCompleted: {
-                if (favoritesPage.favName) {
-                    var exist_fav = UnavDB.getFavorite(favoritesPage.favName);
-                    if (exist_fav[0] === null || exist_fav[1] === null) {
-                        UnavDB.saveFavorite(favoritesPage.favName, favoritesPage.lat, favoritesPage.lng);
-                        favoritesModel.initialize();
-                        favoritesPage.state = "default";
-                    }
-                    else {
-                        favNameField.text = favoritesPage.favName;
-                        PopupUtils.open(confirmOverwrite);
-                    }
-                }
-            }
-
-            backAction: Action {
-                iconName: "back"
-                text: i18n.tr("Back")
-                onTriggered: {
-                    mainPageStack.pop(favoritesPage);
-                }
-            }
-        }
-    ]
-
-    ActionSelectionPopover {
-        id: addActionList
-        z: 100
-        width: units.gu(25)
-        anchors {
-            top: parent.top
-            right: parent.right
-            topMargin: units.gu (7.5)
-        }
-
-        delegate: ListItems.Standard {
-            text: action.text
-        }
-        actions: ActionList {
-            Action {
-                text: i18n.tr("Add Current Position")
-                enabled: (mainPageStack.center_onpos !== 0 && mainPageStack.currentLat !== "null" && mainPageStack.currentLng !== "null")
-                onTriggered: {
-                    favoritesPage.lat = mainPageStack.currentLat;
-                    favoritesPage.lng = mainPageStack.currentLng;
-                    favoritesPage.state = "adding";
-                    addActionList.hide();
-                    favNameField.forceActiveFocus();
-                }
-            }
-            Action {
-                text: i18n.tr("Add Current Destination")
-                enabled: (mainPageStack.routeState !== 'no')
-                onTriggered: {
-                    favoritesPage.lat = mainPageStack.endLat;
-                    favoritesPage.lng = mainPageStack.endLng;
-                    favoritesPage.state = "adding";
-                    addActionList.hide();
-                    favNameField.forceActiveFocus();
-                }
-
-            }
-            Action {
-                text: i18n.tr("Add From Map")
-                onTriggered: mainPageStack.pop(favoritesPage);
+                        PopupUtils.open(confirmOverwrite)
+                    }
+                }
             }
         }
     }
@@ -177,9 +121,7 @@
     Label {
         id: statusLabel
         anchors.centerIn: parent
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-        visible: false
+        visible: favoritesModel.count === 0
         text: i18n.tr("No favorites yet")
     }
 
@@ -189,16 +131,11 @@
         function initialize() {
             favoritesModel.clear();
             var res = UnavDB.getFavorites();
-            var len = res.rows.length;
-            if (len === 0) {
-                statusLabel.visible = true;
-            } else {
-                statusLabel.visible = false;
-                for (var i = 0; i < len; ++i) {
-                    favoritesModel.append({ name: res.rows.item(i).key,
-                                            lat:  res.rows.item(i).lat,
-                                            lng:  res.rows.item(i).lng });
-                }
+            for (var i = 0; i < res.rows.length; ++i) {
+                favoritesModel.append({ name: res.rows.item(i).key,
+                                        lat:  res.rows.item(i).lat,
+                                        lng:  res.rows.item(i).lng
+                                      });
             }
         }
     }
@@ -208,6 +145,7 @@
 
         model: favoritesModel
         anchors.fill: parent
+        interactive: contentHeight > height
 
         delegate: ListItem {
             id: delegate
@@ -219,13 +157,13 @@
                         iconName: "delete"
                         onTriggered: {
                             UnavDB.removeFavorite(model.name);
-                            favoritesModel.initialize();
+                            favoritesModel.remove(index, 1)
                         }
                     }
                 ]
             }
 
-            trailingActions:  ListItemActions {
+            trailingActions: ListItemActions {
                 actions: [
                     Action {
                         iconName: "send"
@@ -262,26 +200,85 @@
         }
     }
 
+    ActionSelectionPopover {
+        id: addActionList
+
+        width: units.gu(25)
+        anchors {
+            top: parent.top
+            right: parent.right
+            rightMargin: units.gu(0.5)
+            topMargin: favoritesPage.header.height
+        }
+
+        delegate: ListItem {
+            Label {
+                text: action.text
+                elide: Text.ElideMiddle
+                opacity: action.enabled ? 1.0 : 0.5
+                anchors { left: parent.left; right: parent.right; margins: units.gu(2); verticalCenter: parent.verticalCenter }
+            }
+        }
+
+        actions: ActionList {
+            Action {
+                text: i18n.tr("Add Current Position")
+                enabled: (mainPageStack.center_onpos !== 0 && mainPageStack.currentLat !== "null" && mainPageStack.currentLng !== "null")
+                onTriggered: {
+                    favoritesPage.lat = mainPageStack.currentLat;
+                    favoritesPage.lng = mainPageStack.currentLng;
+                    favoritesPage.header = addHeader
+                    addActionList.hide();
+                    favNameField.forceActiveFocus();
+                }
+            }
+            Action {
+                text: i18n.tr("Add Current Destination")
+                enabled: (mainPageStack.routeState !== 'no')
+                onTriggered: {
+                    favoritesPage.lat = mainPageStack.endLat;
+                    favoritesPage.lng = mainPageStack.endLng;
+                    favoritesPage.header = addHeader
+                    addActionList.hide();
+                    favNameField.forceActiveFocus();
+                }
+
+            }
+            Action {
+                text: i18n.tr("Add From Map")
+                onTriggered: mainPageStack.pop(favoritesPage);
+            }
+        }
+    }
+
+
     Component {
         id: confirmOverwrite
         Dialog {
             id: dialogue
             title: i18n.tr("Overwrite Favorite")
-            text: i18n.tr("There is a favorite with that name")
-            Button {
-                 text: i18n.tr("Overwrite")
-                 color: UbuntuColors.red
-                 onClicked: {
-                    UnavDB.saveFavorite(favNameField.text, favoritesPage.lat, favoritesPage.lng);
-                    favoritesModel.initialize();
-                    favoritesPage.state = "default";
-                    PopupUtils.close(dialogue);
+            text: i18n.tr("There is already a favorite with that name. Do you want to overwrite it?")
+            Column {
+                width: parent.width
+                Row {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    spacing: units.gu(2)
+                    Button {
+                        text: i18n.tr("Overwrite")
+                        color: UbuntuColors.red
+                        onClicked: {
+                            UnavDB.saveFavorite(favNameField.text, favoritesPage.lat, favoritesPage.lng);
+                            favoritesModel.initialize()
+                            favoritesPage.header = standardHeader
+                            PopupUtils.close(dialogue)
+                        }
+                    }
+                    Button {
+                        text: i18n.tr("Cancel")
+                        onClicked: PopupUtils.close(dialogue)
+                    }
                 }
             }
-            Button {
-                 text: i18n.tr("Cancel")
-                 onClicked: PopupUtils.close(dialogue);
-            }
         }
     }
 }

=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-03-28 17:31:47 +0000
+++ qml/Main.qml	2016-03-28 19:06:40 +0000
@@ -643,7 +643,7 @@
                                 onTriggered: {
                                     if (text.length > 0) {
                                         goThereActionPopover.hide();
-                                        mainPageStack.push(Qt.resolvedUrl("FavoritesPage.qml"), {state: "addingFromPopup", lat: mainPageStack.clickedLat, lng: mainPageStack.clickedLng, favName: favNamePopup.text});
+                                        mainPageStack.push(Qt.resolvedUrl("FavoritesPage.qml"), {isAddedFromPopup: true, lat: mainPageStack.clickedLat, lng: mainPageStack.clickedLng, favName: favNamePopup.text});
                                     }
                                 }
                             }

=== modified file 'qml/PoiListPage.qml'
--- qml/PoiListPage.qml	2016-03-26 21:16:49 +0000
+++ qml/PoiListPage.qml	2016-03-28 19:06:40 +0000
@@ -271,7 +271,7 @@
                         onTriggered: {
                             mainPageStack.pop(poiListPage.fromPage)
                             mainPageStack.pop(poiListPage)
-                            mainPageStack.push(Qt.resolvedUrl("FavoritesPage.qml"), {state:"adding", lat: model.lat, lng: model.lng, favName: model.name})
+                            mainPageStack.push(Qt.resolvedUrl("FavoritesPage.qml"), {isAddedFromPopup: true, lat: model.lat, lng: model.lng, favName: model.name})
                         }
                     },
                     Action {

=== modified file 'qml/js/utils.js'
--- qml/js/utils.js	2016-03-26 18:53:17 +0000
+++ qml/js/utils.js	2016-03-28 19:06:40 +0000
@@ -49,7 +49,7 @@
 		var distance = dist < 1000 ? parseInt(dist) + " m" : parseInt(dist * m2km) + "+ km" ;
 		
 	if (distance === '0 m' || distance === '0 yd')
-		return '';
+        return i18n.tr("Current Location");
 	else
 		return distance;
 }