Merge lp:~cellsoftware/telegram-app/1450227-NEW into lp:telegram-app

[Paz Chauhan]

Country list search feature added during startup

[Jin (jindallo)]

@Paz,
Other files looks good to me,
but for asemancountriesmodel.cpp one,
could you help us to patch that with a synced coding style?
(which mean for the double spaces fuction get())

review: Needs Information

[lp:~cellsoftware/telegram-app/1450227-NEW]

194. By Paz Chauhan on 2016-05-20

Double spacing removed for get() in .cpp file

195. By Paz Chauhan on 2016-05-20

.po and .pot files reverted

[Paz Chauhan (paz-chauhan)]

@jin, double spacing removed

> @Paz,
> Other files looks good to me,
> but for asemancountriesmodel.cpp one,
> could you help us to patch that with a synced coding style?
> (which mean for the double spaces fuction get())

[Jin (jindallo)]

Code looks good to me,
verified pass on my local,
I approve.

[Jin (jindallo)]

review: Approve

=== modified file 'telegram/app/asemantools/asemancountriesmodel.cpp'
--- telegram/app/asemantools/asemancountriesmodel.cpp	2015-09-22 09:57:07 +0000
+++ telegram/app/asemantools/asemancountriesmodel.cpp	2016-05-20 10:00:48 +0000
@@ -140,6 +140,24 @@
     return res;
 }
 
+
+QVariantMap AsemanCountriesModel::get( int rowNumber ) const
+{
+    // Create a map to hold all the role information about the data item in question
+    // Use the role names as the keys for the map so that the same referances can be
+    // used in the QML to get the data (i.e. role_display, role_value).
+
+    QVariantMap map;
+    QHash<int,QByteArray> roleName = roleNames();
+
+    foreach (int i, roleName.keys())
+    {
+        map[roleName.value(i)] = data( index( rowNumber,0 ), i );
+    }
+    return map;
+}
+
+
 QHash<qint32, QByteArray> AsemanCountriesModel::roleNames() const
 {
     static QHash<qint32, QByteArray> *res = 0;

=== modified file 'telegram/app/asemantools/asemancountriesmodel.h'
--- telegram/app/asemantools/asemancountriesmodel.h	2015-09-22 09:57:07 +0000
+++ telegram/app/asemantools/asemancountriesmodel.h	2016-05-20 10:00:48 +0000
@@ -60,7 +60,7 @@
 
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
+    Q_INVOKABLE QVariantMap get( int rowNumber ) const;
     QHash<qint32,QByteArray> roleNames() const;
     int count() const;
 

=== modified file 'telegram/app/qml/AuthCountriesPage.qml'
--- telegram/app/qml/AuthCountriesPage.qml	2016-05-03 05:17:47 +0000
+++ telegram/app/qml/AuthCountriesPage.qml	2016-05-20 10:00:48 +0000
@@ -2,6 +2,8 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import AsemanTools 1.0
+import QtQml.Models 2.1
+
 
 Page {
     id: page
@@ -13,7 +15,57 @@
 
     focus: true
     flickable: null
-    title: i18n.tr("Country Code")
+    title: i18n.tr("Choose a country")
+
+    // Page states
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: page.head
+            actions: [
+                Action {
+                    iconName: "search";
+                    text: i18n.tr("Search");
+                    onTriggered:{
+                        page.state = "search";
+                        search_text_field.forceActiveFocus();
+                    }
+                }
+            ]
+        },
+        PageHeadState {
+            name: "search"
+            head: page.head
+            actions: []
+            backAction: Action {
+                // TRANSLATORS: As in, back out of contacts page.
+                text: i18n.tr("Back")
+                iconName: "back"
+                onTriggered: {
+                    search_text_field.text = "";
+                    page.state = "default";
+                }
+            }
+            contents: TextField {
+                id: search_text_field
+                anchors {
+                    right: parent ? parent.right : undefined
+                    rightMargin: units.gu(2)
+                }
+                focus: true
+                inputMethodHints: Qt.ImhNoPredictiveText
+                onTextChanged: country_list_delegateModel.searchChanged(text)
+                // TRANSLATORS: Placeholder for contacts search field.
+                placeholderText: i18n.tr("Search countries...")
+
+                onTriggered: {
+                    // TODO No worky.
+                    page.state = "default";
+                }
+            }
+        }
+    ]
 
     onCodeChanged: {
         if (code.length > 0) {
@@ -21,6 +73,72 @@
         }
     }
 
+    // Delegate for country_list ListView
+    Component {
+        id: filterDelegate
+        ListItem.SingleValue {
+                    objectName: getObjectName()
+                    text: name
+                    value: nativeName
+                    onClicked: {
+                        country_list.currentIndex = index;
+
+                        // Force change in case same number picked again.
+                        page.code = "";
+                        page.code = callingCode;
+                    }
+
+                    function getObjectName() {
+                        return name.toLowerCase().split(' ').join('_')
+                    }
+                }
+    }
+
+    // In conjunction with DelegateModelGroup this will allow us to
+    // filter the country list based on user input in the search field
+    DelegateModel {
+
+        signal searchChanged(string text)
+
+        id: country_list_delegateModel
+        model: CountriesModel {}
+        delegate: filterDelegate
+
+        groups: [
+            DelegateModelGroup {
+                id: searchResults
+                includeByDefault: true
+                name: "displaySearchResults"
+            }
+        ]
+        filterOnGroup: "displaySearchResults"
+
+        onSearchChanged: {
+            console.log("Searching for " + text);
+            country_list_delegateModel.processSearchFilter(text);
+        }
+
+        function processSearchFilter(searchTerm) {
+
+            var allRowsCount = model.count;
+            var filteredRowsCount = searchResults.count;
+
+            searchResults.remove(0,filteredRowsCount);
+
+            for(var i = 0 ; i < allRowsCount ; i++) {
+                var entry = model.get(i);
+
+                // Perform case insensitive search for the user input within the name of each country
+                if(entry.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 || (searchTerm === "")) {
+//                    console.log("Adding " + entry.name);
+                    searchResults.insert(entry, searchResults.name);
+                }
+            }
+//            console.log("Filter group contains " + searchResults.count + " items");
+        }
+    }
+
+
     ListView {
         id: country_list
         objectName: "countriesList"
@@ -32,23 +150,44 @@
         flickDeceleration: 2000
         maximumFlickVelocity: 5000
 
-        model: CountriesModel {}
-        delegate: ListItem.SingleValue {
-            objectName: getObjectName()
-            text: name
-            value: nativeName
-            onClicked: {
-                country_list.currentIndex = index;
-
-                // Force change in case same number picked again.
-                page.code = "";
-                page.code = callingCode;
-            }
-
-            function getObjectName() {
-                return name.toLowerCase().split(' ').join('_')
-            }
-        }
+        model: country_list_delegateModel
+//=======
+//        model: CountriesModel {}
+//        delegate: ListItem.SingleValue {
+//            objectName: getObjectName()
+//            text: name
+//            value: nativeName
+//            onClicked: {
+//                country_list.currentIndex = index;
+
+//                // Force change in case same number picked again.
+//                page.code = "";
+//                page.code = callingCode;
+//            }
+
+//            function getObjectName() {
+//                return name.toLowerCase().split(' ').join('_')
+//            }
+//        }
+
+
+//        model: CountriesModel {}
+//        delegate: ListItem.SingleValue {
+//            objectName: getObjectName()
+//            text: name
+//            value: nativeName
+//            onClicked: {
+//                country_list.currentIndex = index;
+
+//                // Force change in case same number picked again.
+//                page.code = "";
+//                page.code = callingCode;
+//            }
+
+//            function getObjectName() {
+//                return name.toLowerCase().split(' ').join('_')
+//            }
+//        }
 
         Component.onCompleted: {
             // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition

=== added file 'telegram/app/qml/components/SearchHeadState.qml'
--- telegram/app/qml/components/SearchHeadState.qml	1970-01-01 00:00:00 +0000
+++ telegram/app/qml/components/SearchHeadState.qml	2016-05-20 10:00:48 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2015
+ *      Andrew Hayzen <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+State {
+    name: "search"
+
+    property PageHeader thisHeader: PageHeader {
+        id: headerState
+        contents: TextField {
+            id: searchField
+            anchors {
+                left: parent ? parent.left : undefined
+                right: parent ? parent.right : undefined
+                verticalCenter: parent ? parent.verticalCenter : undefined
+            }
+            color: UbuntuColors.ash
+            focus: true
+            hasClearButton: true
+            inputMethodHints: Qt.ImhNoPredictiveText
+            placeholderText: i18n.tr("Search music")
+
+            // Use the page onVisible as the text field goes visible=false when switching states
+            // This is used when popping from the pageStack and returning back to a page with search
+            Connections {
+                target: thisPage
+
+                onStateChanged: {  // ensure the search is reset (eg pressing Esc)
+                    if (state === "default") {
+                        searchField.text = ""
+                    }
+                }
+
+                onVisibleChanged: {
+                    // clear when the page becomes visible not invisible
+                    // if invisible is used the delegates can be destroyed which
+                    // have created the pushed component
+                    if (visible) {
+                        thisPage.state = "default"
+                    }
+                }
+            }
+        }
+        flickable: thisPage.flickable
+        leadingActionBar {
+            actions: [
+                Action {
+                    id: leaveSearchAction
+                    text: "back"
+                    iconName: "back"
+                    onTriggered: thisPage.state = "default"
+                }
+            ]
+        }
+        visible: thisPage.state === "search"
+
+        onVisibleChanged: {
+            if (visible) {
+                searchField.forceActiveFocus()
+            }
+        }
+
+        StyleHints {
+            backgroundColor: mainView.headerColor
+            dividerColor: Qt.darker(mainView.headerColor, 1.1)
+        }
+    }
+    property Item thisPage
+    property alias query: searchField.text
+
+    PropertyChanges {
+        target: thisPage
+        header: thisHeader
+    }
+}

=== added file 'telegram/app/qml/components/SearchableHeadState.qml'
--- telegram/app/qml/components/SearchableHeadState.qml	1970-01-01 00:00:00 +0000
+++ telegram/app/qml/components/SearchableHeadState.qml	2016-05-20 10:00:48 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2015
+ *      Andrew Hayzen <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+
+State {
+    name: "default"
+
+    property alias searchEnabled: searchAction.enabled
+    property PageHeader thisHeader: PageHeader {
+        id: headerState
+        flickable: thisPage.flickable
+        leadingActionBar {
+            actions: {
+                if (mainPageStack.currentPage === tabs) {
+                    tabs.tabActions
+                } else if (mainPageStack.depth > 1) {
+                    backActionComponent
+                }
+            }
+        }
+        title: thisPage.title
+        trailingActionBar {
+            actions: [
+                Action {
+                    id: searchAction
+                    iconName: "search"
+                    onTriggered: {
+                        thisPage.state = "search";
+                        thisPage.header.contents.forceActiveFocus();
+                    }
+                }
+            ]
+        }
+        visible: thisPage.state === "default"
+
+        Action {
+            id: backActionComponent
+            iconName: "back"
+            onTriggered: mainPageStack.pop()
+        }
+
+        StyleHints {
+            backgroundColor: mainView.headerColor
+            dividerColor: Qt.darker(mainView.headerColor, 1.1)
+        }
+    }
+    property Item thisPage
+
+    PropertyChanges {
+        target: thisPage
+        header: thisHeader
+    }
+}

=== modified file 'telegram/app/telegram.qrc'
--- telegram/app/telegram.qrc	2016-02-29 22:46:12 +0000
+++ telegram/app/telegram.qrc	2016-05-20 10:00:48 +0000
@@ -147,5 +147,7 @@
         <file>qml/files/emoticons-telegram.png</file>
         <file>qml/files/emojis.svg</file>
         <file>qml/InstallStickerDialog.qml</file>
+        <file>qml/components/SearchableHeadState.qml</file>
+        <file>qml/components/SearchHeadState.qml</file>
     </qresource>
 </RCC>